diff options
| author | Ananya Sen | 2012-02-23 13:52:32 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-23 13:52:32 -0800 |
| commit | ec3d07c2fea4e79c68606234074f43d694982e5b (patch) | |
| tree | dc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js | |
| parent | 7283884c39df537694b21419a3ea9e3ca7793b4b (diff) | |
| parent | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff) | |
| download | ninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js')
77 files changed, 4394 insertions, 932 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 67328479..c1b9ed61 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -62,7 +62,7 @@ | |||
| 62 | 62 | ||
| 63 | <div id="breadcrumb_trail" class="breadcrumbtrail"> | 63 | <div id="breadcrumb_trail" class="breadcrumbtrail"> |
| 64 | <div id="breadcrumb_container" class="bread_crumb"> | 64 | <div id="breadcrumb_container" class="bread_crumb"> |
| 65 | <div id="breadcrumb_button" class="toolbutton"></div> | 65 | <div id="breadcrumb_button"></div> |
| 66 | </div> | 66 | </div> |
| 67 | </div> | 67 | </div> |
| 68 | 68 | ||
diff --git a/js/components/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html index 9dad007d..24fce57c 100755 --- a/js/components/layout/subtool-button.reel/subtool-button.html +++ b/js/components/layout/subtool-button.reel/subtool-button.html | |||
| @@ -16,8 +16,7 @@ | |||
| 16 | "module": "js/components/layout/subtool-button.reel", | 16 | "module": "js/components/layout/subtool-button.reel", |
| 17 | "name": "SubToolButton", | 17 | "name": "SubToolButton", |
| 18 | "properties": { | 18 | "properties": { |
| 19 | "element": {"#": "buttonBackground"}, | 19 | "element": {"#": "toolButton"} |
| 20 | "button": {"#": "toolBarButton"} | ||
| 21 | } | 20 | } |
| 22 | } | 21 | } |
| 23 | } | 22 | } |
| @@ -26,9 +25,7 @@ | |||
| 26 | </head> | 25 | </head> |
| 27 | 26 | ||
| 28 | <body> | 27 | <body> |
| 29 | <div id="buttonBackground" class="buttonBackground"> | 28 | <div id="toolButton" class="toolbutton"></div> |
| 30 | <div id="toolBarButton" class="buttonBackground"></div> | ||
| 31 | </div> | ||
| 32 | </body> | 29 | </body> |
| 33 | 30 | ||
| 34 | </html> | 31 | </html> |
diff --git a/js/components/layout/subtool-button.reel/subtool-button.js b/js/components/layout/subtool-button.reel/subtool-button.js index d1adca43..2b066f24 100755 --- a/js/components/layout/subtool-button.reel/subtool-button.js +++ b/js/components/layout/subtool-button.reel/subtool-button.js | |||
| @@ -35,7 +35,7 @@ exports.SubToolButton = Montage.create(Component, { | |||
| 35 | boundObjectPropertyPath: "selected", | 35 | boundObjectPropertyPath: "selected", |
| 36 | oneway: false | 36 | oneway: false |
| 37 | }); | 37 | }); |
| 38 | 38 | this.element.classList.add(this.data.id); | |
| 39 | } | 39 | } |
| 40 | }, | 40 | }, |
| 41 | 41 | ||
| @@ -43,13 +43,9 @@ exports.SubToolButton = Montage.create(Component, { | |||
| 43 | enumerable: false, | 43 | enumerable: false, |
| 44 | value: function() { | 44 | value: function() { |
| 45 | if(this._selected) { | 45 | if(this._selected) { |
| 46 | this.element.classList.add( "buttonSelected" ); | 46 | this.element.classList.add("active"); |
| 47 | this.button.classList.remove( this.data.id + "Unpressed" ); | ||
| 48 | this.button.classList.add( this.data.id + "Pressed" ); | ||
| 49 | } else { | 47 | } else { |
| 50 | this.element.classList.remove( "buttonSelected" ); | 48 | this.element.classList.remove("active"); |
| 51 | this.button.classList.remove( this.data.id + "Pressed" ); | ||
| 52 | this.button.classList.add( this.data.id + "Unpressed" ); | ||
| 53 | } | 49 | } |
| 54 | } | 50 | } |
| 55 | }, | 51 | }, |
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html index 81a9b927..476b66f3 100755 --- a/js/components/layout/tool-button.reel/tool-button.html +++ b/js/components/layout/tool-button.reel/tool-button.html | |||
| @@ -16,8 +16,7 @@ | |||
| 16 | "module": "js/components/layout/tool-button.reel", | 16 | "module": "js/components/layout/tool-button.reel", |
| 17 | "name": "ToolButton", | 17 | "name": "ToolButton", |
| 18 | "properties": { | 18 | "properties": { |
| 19 | "element": {"#": "buttonBackground"}, | 19 | "element": {"#": "toolBarButton"} |