From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 27 Jan 2012 12:05:17 -0800
Subject: Merged old FileIO

---
 js/components/layout/document-bar.reel/document-bar.css  | 0
 js/components/layout/document-bar.reel/document-bar.html | 0
 js/components/layout/document-bar.reel/document-bar.js   | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 js/components/layout/document-bar.reel/document-bar.css
 mode change 100644 => 100755 js/components/layout/document-bar.reel/document-bar.html
 mode change 100644 => 100755 js/components/layout/document-bar.reel/document-bar.js

(limited to 'js/components/layout/document-bar.reel')

diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css
old mode 100644
new mode 100755
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
old mode 100644
new mode 100755
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 0e595c4e11ce9b44eff157de8616ed15fcd5d6fc Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 2 Feb 2012 12:37:29 -0800
Subject: refactoring some file names and locations, change made to maintain
 only one codemirror div.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/components/layout/document-bar.reel/document-bar.css  |  9 ++++++++-
 js/components/layout/document-bar.reel/document-bar.html |  4 ++--
 js/components/layout/document-bar.reel/document-bar.js   | 10 ++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'js/components/layout/document-bar.reel')

diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css
index 588b8952..2a147964 100755
--- a/js/components/layout/document-bar.reel/document-bar.css
+++ b/js/components/layout/document-bar.reel/document-bar.css
@@ -33,7 +33,7 @@
 
 .documentBar span{
     text-decoration: none;
-    cursor: default;
+    cursor: pointer;
     color: #3a3a3a;
 }
 
@@ -41,3 +41,10 @@
     color: white;
 }
 
+.documentBar .enable{
+    color: #d7d7d7;
+}
+
+.documentBar .disable{
+    color: #3a3a3a;
+}
\ No newline at end of file
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index d58f0d14..48f1423c 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -51,8 +51,8 @@
 <body>
     <div id="documentBar">
         <input class="zoomHotText label" id="zoomControlHT"/>
-        <span class="design-view" id="design">Design View</span>
-        <span class="code-view" id="code">Code View</span>
+        <span class="design-view disable" id="design">Design View</span>
+        <span class="code-view disable" id="code">Code View</span>
     </div>
 </body>
 </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 3eece273..44f65804 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -86,7 +86,7 @@ exports.DocumentBar = Montage.create(Component, {
         value: function() {
             this.designView.addEventListener("click", this, false);
             this.codeView.addEventListener("click", this, false);
-         
+
         }
     },
 
@@ -95,7 +95,13 @@ exports.DocumentBar = Montage.create(Component, {
             if(event._event.target.id === this.currentView) return;
 
             this.currentView = event._event.target.id;
-            documentManagerModule.DocumentManager.switchViews();
+            this.application.ninja.documentController.switchViews(event._event.target.id);//switch between design view
+        }
+    },
+
+    handleOnDocumentChanged:{
+        value:function(event){
+
         }
     }
 });
-- 
cgit v1.2.3


From 36b2e540f06cef3887e7d0fea60527fee51e2a40 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Wed, 8 Feb 2012 15:36:53 -0800
Subject: fixed undo/redo for each code view document, changed new file
 integration with io mediator

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/components/layout/document-bar.reel/document-bar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/components/layout/document-bar.reel')

diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 44f65804..ea5e3280 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -95,7 +95,7 @@ exports.DocumentBar = Montage.create(Component, {
             if(event._event.target.id === this.currentView) return;
 
             this.currentView = event._event.target.id;
-            this.application.ninja.documentController.switchViews(event._event.target.id);//switch between design view
+            this.application.ninja.documentController.stage.stageView.switchViews(event._event.target.id);//switch between design view
         }
     },
 
-- 
cgit v1.2.3