aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-08 07:25:09 -0700
committerJohn Mayhew2012-05-08 07:25:09 -0700
commitdd663d8fe9191cc57c9cebe6d425562cb45982c2 (patch)
treee13e2d81d755ac99eede0b8c5aa468f7b32ab38e /js
parent1196fcee1c7e5e86edb387cdbc1b08d40926ca15 (diff)
downloadninja-dd663d8fe9191cc57c9cebe6d425562cb45982c2.tar.gz
Removed unused SubSelect Tool
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html4
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js2
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html8
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html32
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.js14
-rwxr-xr-xjs/data/tools-data.js52
-rwxr-xr-xjs/mediators/keyboard-mediator.js32
-rwxr-xr-xjs/ninja.reel/ninja.js6
8 files changed, 60 insertions, 90 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 0c51aa9a..d5c33624 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -55,9 +55,6 @@
55 "SelectionTool1": { 55 "SelectionTool1": {
56 "prototype": "js/tools/SelectionTool" 56 "prototype": "js/tools/SelectionTool"
57 }, 57 },
58 "SubselectionTool1": {
59 "prototype": "js/tools/SubSelectTool"
60 },
61 "Rotate3DTool1": { 58 "Rotate3DTool1": {
62 "prototype": "js/tools/RotateObject3DTool" 59 "prototype": "js/tools/RotateObject3DTool"
63 }, 60 },
@@ -126,7 +123,6 @@
126 "properties": { 123 "properties": {
127 "element": {"#": "toolsList"}, 124 "element": {"#": "toolsList"},
128 "SelectionTool": {"@": "SelectionTool1"}, 125 "SelectionTool": {"@": "SelectionTool1"},
129 "SubselectionTool": {"@": "SubselectionTool1"},
130 "Rotate3DTool": {"@": "Rotate3DTool1"}, 126 "Rotate3DTool": {"@": "Rotate3DTool1"},
131 "Translate3DTool": {"@": "Translate3DTool1"}, 127 "Translate3DTool": {"@": "Translate3DTool1"},
132 "TagTool": {"@": "TagTool1"}, 128 "TagTool": {"@": "TagTool1"},
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index ed4ee45f..a10b6c3e 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -10,7 +10,6 @@ var Component = require("montage/ui/component").Component;
10exports.ToolsList = Montage.create(Component, { 10exports.ToolsList = Montage.create(Component, {
11 11
12 SelectionTool: { value: null }, 12 SelectionTool: { value: null },
13 SubselectionTool: { value: null },
14 Rotate3DTool: { value: null }, 13 Rotate3DTool: { value: null },
15 Translate3DTool: { value: null }, 14 Translate3DTool: { value: null },
16 TagTool: { value: null }, 15 TagTool: { value: null },
@@ -51,7 +50,6 @@ exports.ToolsList = Montage.create(Component, {
51 this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties; 50 this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties;
52 51
53 this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties; 52 this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties;
54 this.SubselectionTool.options = this.application.ninja.toolsProperties.subSelectionProperties;
55 53
56 this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; 54 this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties;
57 this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; 55 this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties;
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index a24ce658..e7d1ac8b 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -18,12 +18,6 @@
18 "element": {"#": "selectionProperties"} 18 "element": {"#": "selectionProperties"}
19 } 19 }
20 }, 20 },
21 "subSelectionProperties1": {
22 "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]",
23 "properties": {
24 "element": {"#": "subSelectionProperties"}
25 }
26 },
27 "object3DProperties1": { 21 "object3DProperties1": {
28 "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]", 22 "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]",
29 "properties": { 23 "properties": {
@@ -128,7 +122,6 @@
128 "properties": { 122 "properties": {
129 "element": {"#": "toolsProperties"}, 123 "element": {"#": "toolsProperties"},
130 "selectionProperties": {"@": "selectionProperties1"}, 124 "selectionProperties": {"@": "selectionProperties1"},
131 "subSelectionProperties": {"@": "subSelectionProperties1"},
132 "rotate3DProperties": {"@": "object3DProperties1"}, 125 "rotate3DProperties": {"@": "object3DProperties1"},
133 "translate3DProperties": {"@": "object3DProperties1"}, 126 "translate3DProperties": {"@": "object3DProperties1"},
134 "tagProperties": {"@": "tagProperties1"}, 127 "tagProperties": {"@": "tagProperties1"},
@@ -159,7 +152,6 @@
159 <body> 152 <body>
160 <div data-montage-id="toolsProperties" class="panelBackground"> 153 <div data-montage-id="toolsProperties" class="panelBackground">
161 <div data-montage-id="selectionProperties"></div> 154 <div data-montage-id="selectionProperties"></div>
162 <div data-montage-id="subSelectionProperties"></div>
163 <div data-montage-id="object3DProperties"></div> 155 <div data-montage-id="object3DProperties"></div>
164 <div data-montage-id="tagProperties"></div> 156 <div data-montage-id="tagProperties"></div>
165 <div data-montage-id="penProperties"></div> 157 <div data-montage-id="penProperties"></div>
diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
deleted file mode 100755
index bde47659..00000000
--- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
+++ /dev/null
@@ -1,32 +0,0 @@
1<!DOCTYPE HTML>
2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6 </copyright> -->
7<html>
8 <head>
9 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
10
11 <!--<link rel="stylesheet" type="text/css" href="tools-properties.css">-->
12 <script type="text/montage-serialization">
13 {
14
15 "owner": {
16 "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]",
17 "properties": {
18 "element": {"#": "subSelectionProperties"}
19 }
20 }
21 }
22 </script>
23
24 </head>
25
26 <body>
27 <div data-montage-id="subSelectionProperties">
28 <div></div>
29 </div>
30 </body>
31
32</html> \ No newline at end of file
diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.js b/js/components/tools-properties/subselection-properties.reel/subselection-properties.js
deleted file mode 100755
index bcd13642..00000000
--- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.js
+++ /dev/null
@@ -1,14 +0,0 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component;
9var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
10
11exports.SubSelectionProperties = Montage.create(ToolProperties, {
12
13
14}); \ No newline at end of file
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index ac6fe6e5..32eaf24d 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -7,7 +7,48 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
8 8
9exports.ToolsData = Montage.create(Montage, { 9exports.ToolsData = Montage.create(Montage, {
10 selectionToolIndex : {
11 value: 0
12 },
13 rotate3DToolIndex: {
14 value: 1
15 },
16 translate3DToolIndex: {
17 value: 2
18 },
19 tagToolIndex: {
20 value: 3
21 },
22 penToolIndex: {
23 value: 4
24 },
25 textToolIndex: {
26 value: 5
27 },
28 shapeToolIndex: {
29 value: 6
30 },
31 brushToolIndex: {
32 value: 7
33 },
34 fillToolIndex: {
35 value: 8
36 },
37 inkBottleToolIndex: {
38 value: 9
39 },
40 rotateStage3DToolIndex: {
41 value: 10
42 },
43 panToolIndex: {
44 value: 11
45 },
46 zoomToolIndex: {
47 value: 12
48 },
10 49
50 // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above.
51 // Code in the keyboard mediator and ninja.js accesses the array below through the index constants above
11 defaultToolsData: { 52 defaultToolsData: {
12 value: [ 53 value: [
13 { 54 {
@@ -22,17 +63,6 @@ exports.ToolsData = Montage.create(Montage, {
22 "selected": true 63 "selected": true
23 }, 64 },
24 {