aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-15 20:37:48 -0800
committerJose Antonio Marquez2012-02-15 20:37:48 -0800
commit89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch)
tree4d29118f35df77ca6b423119a4ff61694a442cbf /js/components/layout
parent9d2c2a80483415d7560b00cda5519153db23e241 (diff)
parentd366c0bd1af6471511217ed574083e15059519b5 (diff)
downloadninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/components/layout')
-rwxr-xr-x[-rw-r--r--]js/components/layout/bread-crumb-button.reel/bread-crumb-button.css0
-rwxr-xr-x[-rw-r--r--]js/components/layout/bread-crumb-button.reel/bread-crumb-button.html0
-rwxr-xr-x[-rw-r--r--]js/components/layout/bread-crumb-button.reel/bread-crumb-button.js0
-rwxr-xr-x[-rw-r--r--]js/components/layout/bread-crumb.reel/bread-crumb.css0
-rwxr-xr-x[-rw-r--r--]js/components/layout/bread-crumb.reel/bread-crumb.html0
-rwxr-xr-x[-rw-r--r--]js/components/layout/bread-crumb.reel/bread-crumb.js0
-rwxr-xr-x[-rw-r--r--]js/components/layout/document-bar.reel/document-bar.css9
-rwxr-xr-x[-rw-r--r--]js/components/layout/document-bar.reel/document-bar.html4
-rwxr-xr-x[-rw-r--r--]js/components/layout/document-bar.reel/document-bar.js10
-rwxr-xr-x[-rw-r--r--]js/components/layout/document-entry.reel/close_button.gifbin139 -> 139 bytes
-rwxr-xr-x[-rw-r--r--]js/components/layout/document-entry.reel/document-entry.css1
-rwxr-xr-x[-rw-r--r--]js/components/layout/document-entry.reel/document-entry.html0
-rwxr-xr-x[-rw-r--r--]js/components/layout/document-entry.reel/document-entry.js29
-rwxr-xr-x[-rw-r--r--]js/components/layout/documents-tab.reel/documents-tab.css0
-rwxr-xr-x[-rw-r--r--]js/components/layout/documents-tab.reel/documents-tab.html5
-rwxr-xr-x[-rw-r--r--]js/components/layout/documents-tab.reel/documents-tab.js4
-rwxr-xr-x[-rw-r--r--]js/components/layout/stage-mode.reel/stage-mode.css0
-rwxr-xr-x[-rw-r--r--]js/components/layout/stage-mode.reel/stage-mode.html0
-rwxr-xr-x[-rw-r--r--]js/components/layout/stage-mode.reel/stage-mode.js0
-rwxr-xr-x[-rw-r--r--]js/components/layout/subtool-button.reel/subtool-button.css0
-rwxr-xr-x[-rw-r--r--]js/components/layout/subtool-button.reel/subtool-button.html0
-rwxr-xr-x[-rw-r--r--]js/components/layout/subtool-button.reel/subtool-button.js0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tool-button.reel/tool-button.css0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tool-button.reel/tool-button.html0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tool-button.reel/tool-button.js2
-rwxr-xr-x[-rw-r--r--]js/components/layout/tools-list.reel/tools-list.css0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tools-list.reel/tools-list.html0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tools-list.reel/tools-list.js0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tools-properties.reel/tools-properties.css0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tools-properties.reel/tools-properties.html0
-rwxr-xr-x[-rw-r--r--]js/components/layout/tools-properties.reel/tools-properties.js0
31 files changed, 52 insertions, 12 deletions
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css
index 9d0a1eb4..9d0a1eb4 100644..100755
--- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css
+++ b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
index b3fdb0b6..b3fdb0b6 100644..100755
--- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
+++ b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js
index 65e5b7c8..65e5b7c8 100644..100755
--- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js
+++ b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index cc984609..cc984609 100644..100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 67328479..67328479 100644..100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index ead7c764..ead7c764 100644..100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
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});
diff --git a/js/components/layout/document-entry.reel/close_button.gif b/js/components/layout/document-entry.reel/close_button.gif
index 00b5904b..00b5904b 100644..100755
--- a/js/components/layout/document-entry.reel/close_button.gif
+++ b/js/components/layout/document-entry.reel/close_button.gif
Binary files differ
diff --git a/js/components/layout/document-entry.reel/document-entry.css b/js/components/layout/document-entry.reel/document-entry.css
index ce173cd6..52d08d72 100644..100755
--- a/js/components/layout/document-entry.reel/document-entry.css
+++ b/js/components/layout/document-entry.reel/document-entry.css
@@ -35,4 +35,5 @@
35 35
36.documentEntry span.dirty:before{ 36.documentEntry span.dirty:before{
37 content: "*"; 37 content: "*";
38 display:inline;
38} 39}
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index ba17449a..ba17449a 100644..100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.html
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 6f265c91..a1bed79b 100644..100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -77,11 +77,28 @@ exports.DocumentEntry = Montage.create(Component, {
77 } 77 }
78 }, 78 },
79 79
80 _dirtyFlag:{
81 enumerable:false,
82 value:false
83 },
84 dirtyFlag:{
85 get: function() {
86 return this._dirtyFlag;
87 },
88 set: function(value) {
89 var previousValue = this._dirtyFlag;
90 this._dirtyFlag = value;
91
92 if (previousValue !== this._dirtyFlag) {
93 this.needsDraw = true;
94 }
95 }
96 },
80 97
81 prepareForDraw: { 98 prepareForDraw: {
82 enumerable: false, 99 enumerable: false,
83 value: function() { 100 value: function() {
84 //this.element.addEventListener("click", this, false); 101 this.element.addEventListener("click", this, false);
85 } 102 }
86 }, 103 },
87 104
@@ -92,16 +109,22 @@ exports.DocumentEntry = Montage.create(Component, {
92 this.label.innerText = this._name ? this._name : ""; 109 this.label.innerText = this._name ? this._name : "";
93 110
94 this._active ? this.element.classList.add("activeTab") : this.element.classList.remove("activeTab"); 111 this._active ? this.element.classList.add("activeTab") : this.element.classList.remove("activeTab");
112
113 if(this.dirtyFlag === true){
114 if(!this.label.classList.contains("dirty")){this.label.classList.add("dirty");}
115 }else{
116 if(this.label.classList.contains("dirty")){this.label.classList.remove("dirty");}
117 }
95 } 118 }
96 }, 119 },
97