diff options
| author | Armen Kesablyan | 2012-02-22 16:26:41 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-22 16:26:41 -0800 |
| commit | 0bd1cefea2ab350fad1a891bdc926053b799aafc (patch) | |
| tree | 962f559fcc02a3dfeb297d59907e40fa153453f3 /js/components/layout/document-bar.reel | |
| parent | 695bc5082f48dddf66ce31480a4faefc067b38bd (diff) | |
| parent | 2d2b1af8b5c0d506fe6a1cf65614101fec145970 (diff) | |
| download | ninja-0bd1cefea2ab350fad1a891bdc926053b799aafc.tar.gz | |
Merge branch 'refs/heads/master' into new-tool-icons
Diffstat (limited to 'js/components/layout/document-bar.reel')
| -rwxr-xr-x[-rw-r--r--] | js/components/layout/document-bar.reel/document-bar.css | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | js/components/layout/document-bar.reel/document-bar.html | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | js/components/layout/document-bar.reel/document-bar.js | 10 |
3 files changed, 18 insertions, 5 deletions
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 100644..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 @@ | |||
| 33 | 33 | ||
| 34 | .documentBar span{ | 34 | .documentBar span{ |
| 35 | text-decoration: none; | 35 | text-decoration: none; |
| 36 | cursor: default; | 36 | cursor: pointer; |
| 37 | color: #3a3a3a; | 37 | color: #3a3a3a; |
| 38 | } | 38 | } |
| 39 | 39 | ||
| @@ -41,3 +41,10 @@ | |||
| 41 | color: white; | 41 | color: white; |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | .documentBar .enable{ | ||
| 45 | color: #d7d7d7; | ||
| 46 | } | ||
| 47 | |||
| 48 | .documentBar .disable{ | ||
| 49 | color: #3a3a3a; | ||
| 50 | } \ 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 100644..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 @@ | |||
| 51 | <body> | 51 | <body> |
| 52 | <div id="documentBar"> | 52 | <div id="documentBar"> |
| 53 | <input class="zoomHotText label" id="zoomControlHT"/> | 53 | <input class="zoomHotText label" id="zoomControlHT"/> |
| 54 | <span class="design-view" id="design">Design View</span> | 54 | <span class="design-view disable" id="design">Design View</span> |
| 55 | <span class="code-view" id="code">Code View</span> | 55 | <span class="code-view disable" id="code">Code View</span> |
| 56 | </div> | 56 | </div> |
| 57 | </body> | 57 | </body> |
| 58 | </html> \ No newline at end of file | 58 | </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..ea5e3280 100644..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, { | |||
| 86 | value: function() { | 86 | value: function() { |
| 87 | this.designView.addEventListener("click", this, false); | 87 | this.designView.addEventListener("click", this, false); |
| 88 | this.codeView.addEventListener("click", this, false); | 88 | this.codeView.addEventListener("click", this, false); |
| 89 | 89 | ||
| 90 | } | 90 | } |
| 91 | }, | 91 | }, |
| 92 | 92 | ||
| @@ -95,7 +95,13 @@ exports.DocumentBar = Montage.create(Component, { | |||
| 95 | if(event._event.target.id === this.currentView) return; | 95 | if(event._event.target.id === this.currentView) return; |
| 96 | 96 | ||
| 97 | this.currentView = event._event.target.id; | 97 | this.currentView = event._event.target.id; |
| 98 | documentManagerModule.DocumentManager.switchViews(); | 98 | this.application.ninja.documentController.stage.stageView.switchViews(event._event.target.id);//switch between design view |
| 99 | } | ||
| 100 | }, | ||
| 101 | |||
| 102 | handleOnDocumentChanged:{ | ||
| 103 | value:function(event){ | ||
| 104 | |||
| 99 | } | 105 | } |
| 100 | } | 106 | } |
| 101 | }); | 107 | }); |