diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/components/layout/document-bar.reel | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/components/layout/document-bar.reel')
| -rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.html | 10 | ||||
| -rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.js | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index 8dcaf178..760186ba 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html | |||
| @@ -61,11 +61,11 @@ | |||
| 61 | </head> | 61 | </head> |
| 62 | 62 | ||
| 63 | <body> | 63 | <body> |
| 64 | <div id="documentBar"> | 64 | <div data-montage-id="documentBar"> |
| 65 | <input class="zoomHotText label" id="zoomControlHT"/> | 65 | <input class="zoomHotText label" data-montage-id="zoomControlHT"/> |
| 66 | <span class="design-view disable" id="design">Design View</span> | 66 | <span class="design-view disable" data-montage-id="design">Design View</span> |
| 67 | <span class="code-view disable" id="code">Code View</span> | 67 | <span class="code-view disable" data-montage-id="code">Code View</span> |
| 68 | <div id="disabledCondition" class="panelDisabled"></div> | 68 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
| 69 | </div> | 69 | </div> |
| 70 | </body> | 70 | </body> |
| 71 | </html> \ No newline at end of file | 71 | </html> \ No newline at end of file |
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 | ||