diff options
| author | Ananya Sen | 2012-02-22 12:18:25 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-22 12:18:25 -0800 |
| commit | dbf0ca5637a3bca87c21c65ada47f8a4d794f78c (patch) | |
| tree | ace2a2415ef14662c27cdb2528914bef0a7f9208 /js/components/layout/document-entry.reel | |
| parent | 9aa442da1ac9fd3212b37fa63a36090af47b6808 (diff) | |
| parent | 27589634d3e8ea52abe8623f8f2cc48ce0aa04c9 (diff) | |
| download | ninja-dbf0ca5637a3bca87c21c65ada47f8a4d794f78c.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/layout/document-entry.reel')
| -rwxr-xr-x | js/components/layout/document-entry.reel/document-entry.html | 1 | ||||
| -rwxr-xr-x | js/components/layout/document-entry.reel/document-entry.js | 24 |
2 files changed, 11 insertions, 14 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html index ba17449a..1cf01737 100755 --- a/js/components/layout/document-entry.reel/document-entry.html +++ b/js/components/layout/document-entry.reel/document-entry.html | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | <body> | 26 | <body> |
| 27 | <li id="documentEntry" class="documentEntry"> | 27 | <li id="documentEntry" class="documentEntry"> |
| 28 | <div id="isActive"></div> | 28 | <div id="isActive"></div> |
| 29 | <div id="dirtyFlag"></div> | ||
| 30 | <span id="name"></span> | 29 | <span id="name"></span> |
| 31 | <img src="js/components/layout/document-entry.reel/close_button.gif"> | 30 | <img src="js/components/layout/document-entry.reel/close_button.gif"> |
| 32 | </li> | 31 | </li> |
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js index a1bed79b..9e4110e2 100755 --- a/js/components/layout/document-entry.reel/document-entry.js +++ b/js/components/layout/document-entry.reel/document-entry.js | |||
| @@ -77,19 +77,17 @@ exports.DocumentEntry = Montage.create(Component, { | |||
| 77 | } | 77 | } |
| 78 | }, | 78 | }, |
| 79 | 79 | ||
| 80 | _dirtyFlag:{ | 80 | _saveFlag: { |
| 81 | enumerable:false, | 81 | value: false |
| 82 | value:false | ||
| 83 | }, | 82 | }, |
| 84 | dirtyFlag:{ | 83 | |
| 84 | saveFlag: { | ||
| 85 | get: function() { | 85 | get: function() { |
| 86 | return this._dirtyFlag; | 86 | return this._saveFlag; |
| 87 | }, | 87 | }, |
| 88 | set: function(value) { | 88 | set: function(value) { |
| 89 | var previousValue = this._dirtyFlag; | 89 | if(this._saveFlag !== value) { |
| 90 | this._dirtyFlag = value; | 90 | this._saveFlag = value; |
| 91 | |||
| 92 | if (previousValue !== this._dirtyFlag) { | ||
| 93 | this.needsDraw = true; | 91 | this.needsDraw = true; |
| 94 | } | 92 | } |
| 95 | } | 93 | } |
| @@ -110,10 +108,10 @@ exports.DocumentEntry = Montage.create(Component, { | |||
| 110 | 108 | ||
| 111 | this._active ? this.element.classList.add("activeTab") : this.element.classList.remove("activeTab"); | 109 | this._active ? this.element.classList.add("activeTab") : this.element.classList.remove("activeTab"); |
| 112 | 110 | ||
| 113 | if(this.dirtyFlag === true){ | 111 | if(this.saveFlag) { |
| 114 | if(!this.label.classList.contains("dirty")){this.label.classList.add("dirty");} | 112 | this.label.classList.add("dirty"); |
| 115 | }else{ | 113 | } else { |
| 116 | if(this.label.classList.contains("dirty")){this.label.classList.remove("dirty");} | 114 | this.label.classList.remove("dirty"); |
| 117 | } | 115 | } |
| 118 | } | 116 | } |
| 119 | }, | 117 | }, |