diff options
| author | Jon Reid | 2012-05-04 14:56:24 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-04 14:56:24 -0700 |
| commit | a6dd2917edcfeca1be7553e03281ddd538422ae1 (patch) | |
| tree | e6846626bf1e967e80bcd652f6a76bb97abb1789 /js/components | |
| parent | 7fc185cc08b2ba912dbc7bce96f6a465c1dd6dbf (diff) | |
| parent | 8964e070fa760d23c2de272ca36b8d9beba6007d (diff) | |
| download | ninja-a6dd2917edcfeca1be7553e03281ddd538422ae1.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/components')
5 files changed, 14 insertions, 14 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js index 66a02725..56b61f1d 100755 --- a/js/components/layout/document-bar.reel/document-bar.js +++ b/js/components/layout/document-bar.reel/document-bar.js | |||
| @@ -99,7 +99,7 @@ exports.DocumentBar = Montage.create(Component, { | |||
| 99 | if(event._event.target.id === this.currentView) return; | 99 | if(event._event.target.id === this.currentView) return; |
| 100 | 100 | ||
| 101 | this.currentView = event._event.target.id; | 101 | this.currentView = event._event.target.id; |
| 102 | this.application.ninja.documentController.stage.stageView.switchViews(event._event.target.id);//switch between design view | 102 | this.application.ninja.documentController.stage.stageView.switchDesignDocViews(event._event.target.id);//switch between design view |
| 103 | } | 103 | } |
| 104 | }, | 104 | }, |
| 105 | 105 | ||
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html index f2406566..2ad5885a 100755 --- a/js/components/ui/icon-list-basic/icon.reel/icon.html +++ b/js/components/ui/icon-list-basic/icon.reel/icon.html | |||
| @@ -22,9 +22,9 @@ | |||
| 22 | </script> | 22 | </script> |
| 23 | </head> | 23 | </head> |
| 24 | <body> | 24 | <body> |
| 25 | <div id="icon" class="icon"> | 25 | <div data-montage-id="icon" class="icon"> |
| 26 | <div><img id="iconImg" class="iconImg" src="" /></div> | 26 | <div><img data-montage-id="iconImg" class="iconImg" src="" /></div> |
| 27 | <div id="iconLabel" class="iconLabel"></div> | 27 | <div data-montage-id="iconLabel" class="iconLabel"></div> |
| 28 | </div> | 28 | </div> |
| 29 | </body> | 29 | </body> |
| 30 | </html> \ No newline at end of file | 30 | </html> \ No newline at end of file |
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html index 35260527..05d3ea7d 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html | |||
| @@ -55,9 +55,9 @@ | |||
| 55 | </script> | 55 | </script> |
| 56 | </head> | 56 | </head> |
| 57 | <body> | 57 | <body> |
| 58 | <div id="list" class="list"> | 58 | <div data-montage-id="list" class="list"> |
| 59 | <div id="iconsView"> | 59 | <div data-montage-id="iconsView"> |
| 60 | <div id="icon"></div> | 60 | <div data-montage-id="icon"></div> |
| 61 | </div> | 61 | </div> |
| 62 | </div> | 62 | </div> |
| 63 | </body> | 63 | </body> |
diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html index f0c51fcc..1144b563 100755 --- a/js/components/ui/tree-basic/tree.reel/tree.html +++ b/js/components/ui/tree-basic/tree.reel/tree.html | |||
| @@ -65,9 +65,9 @@ | |||
| 65 | </script> | 65 | </script> |
| 66 | </head> | 66 | </head> |
| 67 | <body> | 67 | <body> |
| 68 | <div id="atree" class="atree"> | 68 | <div data-montage-id="atree" class="atree"> |
| 69 | <ul id="treeView" style="display:block;"> | 69 | <ul data-montage-id="treeView" style="display:block;"> |
| 70 | <li id="treeItem"></li> | 70 | <li data-montage-id="treeItem"></li> |
| 71 | </ul> | 71 | </ul> |
| 72 | </div> | 72 | </div> |
| 73 | </body> | 73 | </body> |
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.html b/js/components/ui/tree-basic/treeItem.reel/treeItem.html index 9b8cb1ea..c5cdc533 100755 --- a/js/components/ui/tree-basic/treeItem.reel/treeItem.html +++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.html | |||
| @@ -23,12 +23,12 @@ | |||
| 23 | </script> | 23 | </script> |
| 24 | </head> | 24 | </head> |
| 25 | <body> | 25 | <body> |
| 26 | <li id="atreeItem" class="atreeItem"> | 26 | <li data-montage-id="atreeItem" class="atreeItem"> |
| 27 | <span id="treeArrow" class="treeArrow hidden">▶</span> | 27 | <span data-montage-id="treeArrow" class="treeArrow hidden">▶</span> |
| 28 | <div class="atreeItemContent atreeItemImgContainer" > | 28 | <div class="atreeItemContent atreeItemImgContainer" > |
| 29 | <img id="atreeItemImg" class="atreeItemImg" src="" /> | 29 | <img data-montage-id="atreeItemImg" class="atreeItemImg" src="" /> |
| 30 | </div> | 30 | </div> |
| 31 | <span id="name" class="atreeItemContent name"></span> | 31 | <span data-montage-id="name" class="atreeItemContent name"></span> |
| 32 | </li> | 32 | </li> |
| 33 | </body> | 33 | </body> |
| 34 | </html> \ No newline at end of file | 34 | </html> \ No newline at end of file |