diff options
author | Nivesh Rajbhandari | 2012-02-22 11:04:18 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-22 11:04:18 -0800 |
commit | ecd0dc6ffd21aedfb5ae8f617af36e48a2ba72ce (patch) | |
tree | df63accaeccb899ab1ecc107ab361629a5ca3452 /js/controllers | |
parent | 96a0a8c916533eb5625816192ed38488f639326d (diff) | |
parent | 2f24dafec79583547fe663d5a387d8ef15aae3bf (diff) | |
download | ninja-ecd0dc6ffd21aedfb5ae8f617af36e48a2ba72ce.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/document-controller.js | 49 | ||||
-rwxr-xr-x | js/controllers/elements/element-controller.js | 3 | ||||
-rwxr-xr-x | js/controllers/selection-controller.js | 36 | ||||
-rwxr-xr-x | js/controllers/styles-controller.js | 7 |
4 files changed, 62 insertions, 33 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 1f339fe7..7491ef9f 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -66,35 +66,37 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
66 | 66 | ||
67 | 67 | ||
68 | 68 | ||
69 | handleWebRequest: { | ||
70 | value: function (request) { | ||
71 | if (request.url.indexOf('js/document/templates/montage-html') !== -1) { | ||
72 | 69 | ||
73 | console.log(request); | ||
74 | 70 | ||
75 | //TODO: Figure out why active document is not available here | ||
76 | 71 | ||
77 | if (this._hackRootFlag) { | ||
78 | |||
79 | //console.log(request.url.split('/')[request.url.split('/').length-1]); | ||
80 | //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]); | ||
81 | 72 | ||
73 | //////////////////////////////////////////////////////////////////// | ||
74 | // | ||
75 | handleWebRequest: { | ||
76 | value: function (request) { | ||
77 | if (this._hackRootFlag && request.url.indexOf('js/document/templates/montage-html') !== -1) { | ||
78 | //TODO: Optimize creating string | ||
82 | return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]}; | 79 | return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]}; |
83 | } | 80 | } |
84 | } | 81 | } |
85 | } | ||
86 | }, | 82 | }, |
87 | 83 | //////////////////////////////////////////////////////////////////// | |
88 | 84 | // | |
89 | handleAppLoaded: { | 85 | handleAppLoaded: { |
90 | value: function() { | 86 | value: function() { |
91 | // | 87 | //Adding an intercept to resources loaded to ensure user assets load from cloud simulator |
92 | |||
93 | chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]); | 88 | chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]); |
94 | |||
95 | } | 89 | } |
96 | }, | 90 | }, |
91 | //////////////////////////////////////////////////////////////////// | ||
97 | 92 | ||
93 | |||
94 | |||
95 | |||
96 | |||
97 | |||
98 | |||
99 | |||
98 | handleExecuteFileOpen: { | 100 | handleExecuteFileOpen: { |
99 | value: function(event) { | 101 | value: function(event) { |
100 | var pickerSettings = event._event.settings || {}; | 102 | var pickerSettings = event._event.settings || {}; |
@@ -118,28 +120,21 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
118 | //TODO: Check for appropiate structures | 120 | //TODO: Check for appropiate structures |
119 | handleExecuteSave: { | 121 | handleExecuteSave: { |
120 | value: function(event) { | 122 | value: function(event) { |
123 | if(!!this.activeDocument){ | ||
121 | //Text and HTML document classes should return the same save object for fileSave | 124 | //Text and HTML document classes should return the same save object for fileSave |
122 | this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this)); | 125 | this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this)); |
123 | } | 126 | } |
127 | } | ||
124 | }, | 128 | }, |
125 | //////////////////////////////////////////////////////////////////// | 129 | //////////////////////////////////////////////////////////////////// |
126 | // | 130 | // |
127 | fileSaveResult: { | 131 | fileSaveResult: { |
128 | value: function (result) { | 132 | value: function (result) { |
129 | if(result.status === 204){ | 133 | if(result.status === 204){ |
130 | this.clearDocumentDirtyFlag(); | 134 | this.activeDocument.needsSave = false; |
131 | } | 135 | } |
132 | } | 136 | } |
133 | }, | 137 | }, |
134 | //////////////////////////////////////////////////////////////////// | ||
135 | |||
136 | |||
137 | clearDocumentDirtyFlag:{ | ||
138 | value: function(){ | ||
139 | this.activeDocument.dirtyFlag = false; | ||
140 | } | ||
141 | }, | ||
142 | |||
143 | 138 | ||
144 | createNewFile:{ | 139 | createNewFile:{ |
145 | value:function(newFileObj){ | 140 | value:function(newFileObj){ |
@@ -278,7 +273,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
278 | 273 | ||
279 | closeDocument: { | 274 | closeDocument: { |
280 | value: function(id) { | 275 | value: function(id) { |
281 | if(this.activeDocument.dirtyFlag === true){ | 276 | if(this.activeDocument.needsSave === true){ |
282 | //if file dirty then alert user to save | 277 | //if file dirty then alert user to save |
283 | } | 278 | } |
284 | 279 | ||
@@ -301,6 +296,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
301 | this._removeDocumentView(doc.container); | 296 | this._removeDocumentView(doc.container); |
302 | this.application.ninja.stage.stageView.hideRulers(); | 297 | this.application.ninja.stage.stageView.hideRulers(); |
303 | document.getElementById("iframeContainer").style.display="block"; | 298 | document.getElementById("iframeContainer").style.display="block"; |
299 | |||
300 | this.application.ninja.stage.hideCanvas(true); | ||
304 | } | 301 | } |
305 | } | 302 | } |
306 | }, | 303 | }, |
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 5eb75613..46e82ace 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -12,6 +12,9 @@ var ElementController = exports.ElementController = Montage.create(NJComponent, | |||
12 | addElement: { | 12 | addElement: { |
13 | value: function(el, styles) { | 13 | value: function(el, styles) { |
14 | this.application.ninja.currentDocument.documentRoot.appendChild(el); | 14 | this.application.ninja.currentDocument.documentRoot.appendChild(el); |
15 | // Nested elements - | ||
16 | // TODO make sure the CSS is correct before nesting elements | ||
17 | // this.application.ninja.currentSelectedContainer.appendChild(el); | ||
15 | this.application.ninja.stylesController.setElementStyles(el, styles); | 18 | this.application.ninja.stylesController.setElementStyles(el, styles); |
16 | } | 19 | } |
17 | }, | 20 | }, |
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index 833e6f04..d69b53e0 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -20,6 +20,26 @@ exports.SelectionController = Montage.create(Component, { | |||
20 | } | 20 | } |
21 | }, | 21 | }, |
22 | 22 | ||
23 | /* | ||
24 | * Bound property to the ninja currentSelectedContainer | ||
25 | */ | ||
26 | _selectionContainer: { | ||
27 | value: null | ||
28 | }, | ||
29 | |||
30 | selectionContainer: { | ||
31 | get: function() { | ||
32 | return this._selectionContainer | ||
33 | }, | ||
34 | set: function(value) { | ||
35 | if(this._selectionContainer && this._selectionContainer !== value) { | ||
36 | this.executeSelectElement(); | ||
37 | } | ||
38 | |||
39 | this._selectionContainer = value; | ||
40 | } | ||
41 | }, | ||
42 | |||
23 | deserializedFromTemplate: { | 43 | deserializedFromTemplate: { |
24 | value: function() { | 44 | value: function() { |
25 | this.eventManager.addEventListener("openDocument", this, false); | 45 | this.eventManager.addEventListener("openDocument", this, false); |
@@ -53,7 +73,9 @@ exports.SelectionController = Montage.create(Component, { | |||
53 | } | 73 | } |
54 | } | 74 | } |
55 | 75 | ||
56 | this.dispatchEvent(selectionEvent.event); | 76 | // |
77 | this._selectionContainer = this.application.ninja.currentSelectedContainer; | ||
78 | |||
57 | } | 79 | } |
58 | }, | 80 | }, |
59 | 81 | ||
@@ -66,13 +88,10 @@ exports.SelectionController = Montage.create(Component, { | |||
66 | handleElementDeleted: { | 88 | handleElementDeleted: { |
67 | value: function(event) { | 89 | value: function(event) { |
68 | if(!this._isDocument) { | 90 | if(!this._isDocument) { |
69 | |||
70 | if(this.findSelectedElement(event.detail) !== -1) { | 91 | if(this.findSelectedElement(event.detail) !== -1) { |
71 | this.executeSelectElement(); | 92 | this.executeSelectElement(); |
72 | } | 93 | } |
73 | |||
74 | } | 94 | } |
75 | |||
76 | } | 95 | } |
77 | }, | 96 | }, |
78 | 97 | ||
@@ -130,12 +149,17 @@ exports.SelectionController = Montage.create(Component, { | |||
130 | this.executeSelectElement(); // Else execute selection with no item | 149 | this.executeSelectElement(); // Else execute selection with no item |
131 | } else { | 150 | } else { |
132 | 151 | ||
133 | if(item.parentNode.id == "UserContent") { | 152 | // if(item.parentNode.id === "UserContent") { |
153 | if(item.parentNode.uuid === this.selectionContainer.uuid) { | ||
134 | this.executeSelectElement(item); | 154 | this.executeSelectElement(item); |
135 | } else { | 155 | } else { |
136 | var outerElement = item.parentNode; | 156 | var outerElement = item.parentNode; |
137 | 157 | ||
138 |