aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/document-bar.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-22 13:22:26 -0700
committerPushkar Joshi2012-05-22 13:22:26 -0700
commit01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch)
treeceb527713554f506c537168e36a10452cd09ad10 /js/components/layout/document-bar.reel
parentb9262c831952e77135b79c2de7c455d5e7ff0589 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/layout/document-bar.reel')
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html10
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js2
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