aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html19
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js248
-rwxr-xr-xjs/controllers/document-controller.js6
-rwxr-xr-xjs/document/document-html.js43
-rwxr-xr-xjs/document/models/base.js22
5 files changed, 206 insertions, 132 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 9e5e4eb2..3e3ac936 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -75,20 +75,17 @@ POSSIBILITY OF SUCH DAMAGE.
75 "element": {"#": "previewButton"}, 75 "element": {"#": "previewButton"},
76 "identifier": "preview", 76 "identifier": "preview",
77 "label": "Preview" 77 "label": "Preview"
78 }, 78 }
79 "listeners": [
80 {
81 "type": "action",
82 "listener": {"@": "owner"}
83 }
84 ]
85 }, 79 },
86 80
87 "owner": { 81 "owner": {
88 "prototype": "js/components/layout/document-bar.reel", 82 "prototype": "js/components/layout/document-bar.reel",
89 "properties": { 83 "properties": {
90 "element": {"#": "documentBar"}, 84 "element": {"#": "documentBar"},
91 "zoomControl": {"@": "hottext1"} 85 "zoomControl": {"@": "hottext1"},
86 "btnDesign": {"#": "buttonDesign"},
87 "btnCode": {"#": "buttonCode"},
88 "btnPreview": {"#": "buttonPreview"}
92 } 89 }
93 } 90 }
94 } 91 }
@@ -108,7 +105,7 @@ POSSIBILITY OF SUCH DAMAGE.
108 105
109 </section> 106 </section>
110 107
111 <section> 108 <section data-montage-id="buttonDesign">
112 109
113 <div class="viewicon viewdesign"></div> 110 <div class="viewicon viewdesign"></div>
114 111
@@ -116,7 +113,7 @@ POSSIBILITY OF SUCH DAMAGE.
116 113
117 </section> 114 </section>
118 115
119 <section class="inactive"> 116 <section data-montage-id="buttonCode">
120 117
121 <div class="viewicon viewcode"></div> 118 <div class="viewicon viewcode"></div>
122 119
@@ -124,7 +121,7 @@ POSSIBILITY OF SUCH DAMAGE.
124 121
125 </section> 122 </section>
126 123
127 <section class="inactive"> 124 <section data-montage-id="buttonPreview" class="inactive">
128 125
129 <div class="viewicon viewPreview"></div> 126 <div class="viewicon viewPreview"></div>
130 127
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index fa0c8788..5623f825 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -29,140 +29,127 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> */ 30</copyright> */
31 31
32var Montage = require("montage/core/core").Montage; 32////////////////////////////////////////////////////////////////////////
33var Component = require("montage/ui/component").Component; 33//
34 34var Montage = require("montage/core/core").Montage,
35 Component = require("montage/ui/component").Component;
36////////////////////////////////////////////////////////////////////////
37//
35exports.DocumentBar = Montage.create(Component, { 38exports.DocumentBar = Montage.create(Component, {
36 39 ////////////////////////////////////////////////////////////////////
37 _currentDocument: { 40 //
38 enumerable: false, 41 _currentDocument: {value: null},
39 value: null 42 ////////////////////////////////////////////////////////////////////
40 }, 43 //
41
42 currentDocument: { 44 currentDocument: {
43 enumerable: false, 45 get: function() {return this._currentDocument;},
44 get: function() {
45 return this._currentDocument;
46 },
47 set: function(value) { 46 set: function(value) {
47 //
48 if (value === this._currentDocument) { 48 if (value === this._currentDocument) {
49 return; 49 return;
50 } 50 }
51 51 //
52 this._currentDocument = value; 52 this._currentDocument = value;
53
54 this.disabled = !this._currentDocument; 53 this.disabled = !this._currentDocument;
55 54 //
56 if(this._currentDocument && this._currentDocument.currentView === "design") { 55 if(this._currentDocument && this._currentDocument.model && this._currentDocument.model.currentView === this._currentDocument.model.views.design) {
57 this.visible = true; 56 this.btnCode.setAttribute('class', 'inactive');
58 } else if(this._currentDocument && this._currentDocument.currentView === "code") { 57 this.btnDesign.removeAttribute('class');
59 this.visible = false; 58 } else if(this._currentDocument && this._currentDocument.model && this._currentDocument.model.currentView === this._currentDocument.model.views.code) {
59 this.btnDesign.setAttribute('class', 'inactive');
60 this.btnCode.removeAttribute('class');
60 } 61 }
62 //
63 this.visible = true;
61 } 64 }
62 }, 65 },
63 66 ////////////////////////////////////////////////////////////////////
67 //
68 btnCode: {
69 value: null
70 },
71 btnDesign: {
72 value: null
73 },
74 btnPreview: {
75 value: null
76 },
77 ////////////////////////////////////////////////////////////////////
78 //
64 _visible: { 79 _visible: {
65 value: false 80 value: false
66 }, 81 },
67 82 ////////////////////////////////////////////////////////////////////
83 //
68 visible: { 84 visible: {
69 get: function() { 85 get: function() {return this._visible;},
70 return this._visible;
71 },
72 set: function(value) { 86 set: function(value) {
87 //
73 if(this._visible !== value) { 88 if(this._visible !== value) {
74 this._visible = value; 89 this._visible = value;
75 this.needsDraw = true; 90 this.needsDraw = true;
76 } 91 }
77 } 92 }
78 }, 93 },
79 94 ////////////////////////////////////////////////////////////////////
80 designView: { 95 //
81 value: null
82 },
83
84 codeView: {
85 value: null
86 },
87
88 zoomControl: { 96 zoomControl: {
89 value: null, 97 value: null,
90 serializable: true 98 serializable: true
91 }, 99 },
92 100 ////////////////////////////////////////////////////////////////////
93 _type: { 101 //
94 value: null
95 },
96
97 type: {
98 enumerable: false,
99 get: function() { return this._type; },
100 set: function(value) {
101 if (this._type === value) {
102 return;
103 }
104
105 this._type = value;
106 this.needsDraw = true;
107
108 }
109 },
110
111 _currentView: {
112 value: null
113 },
114
115 currentView: {
116 get: function() { return this._currentView},
117 set: function(value) {
118 if (this._currentView === value) {
119 return;
120 }