aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js52
-rwxr-xr-xjs/controllers/elements/element-controller.js49
-rwxr-xr-xjs/controllers/elements/shapes-controller.js140
-rwxr-xr-xjs/controllers/selection-controller.js13
-rwxr-xr-xjs/controllers/styles-controller.js10
5 files changed, 211 insertions, 53 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index a8056519..7d982a62 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -60,8 +60,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
60 this.eventManager.addEventListener("executeSave", this, false); 60 this.eventManager.addEventListener("executeSave", this, false);
61 this.eventManager.addEventListener("executeSaveAs", this, false); 61 this.eventManager.addEventListener("executeSaveAs", this, false);
62 this.eventManager.addEventListener("executeSaveAll", this, false); 62 this.eventManager.addEventListener("executeSaveAll", this, false);
63 this.eventManager.addEventListener("executeFileClose", this, false);
63 64
64 this.eventManager.addEventListener("recordStyleChanged", this, false); 65 this.eventManager.addEventListener("styleSheetDirty", this, false);
65 66
66 } 67 }
67 }, 68 },
@@ -157,17 +158,29 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
157 if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){ 158 if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
158 saveAsSettings.fileName = this.activeDocument.name; 159 saveAsSettings.fileName = this.activeDocument.name;
159 saveAsSettings.folderUri = this.activeDocument.uri.substring(0, this.activeDocument.uri.lastIndexOf("/")); 160 saveAsSettings.folderUri = this.activeDocument.uri.substring(0, this.activeDocument.uri.lastIndexOf("/"));
160 //add callback 161 saveAsSettings.callback = this.saveAsCallback.bind(this);
161 this.application.ninja.newFileController.showSaveAsDialog(saveAsSettings); 162 this.application.ninja.newFileController.showSaveAsDialog(saveAsSettings);
162 } 163 }
163 } 164 }
164 }, 165 },
165 166 ////////////////////////////////////////////////////////////////////
167 handleExecuteFileClose:{
168 value: function(event) {
169 if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
170 this.closeDocument(this.activeDocument.uuid);
171 }
172 }
173 },
174 ////////////////////////////////////////////////////////////////////
166 // 175 //
167 fileSaveResult: { 176 fileSaveResult: {
168 value: function (result) { 177 value: function (result) {
169 if(result.status === 204){ 178 if((result.status === 204) || (result.status === 404)){//204=>existing file || 404=>new file... saved
170 this.activeDocument.needsSave = false; 179 this.activeDocument.needsSave = false;
180 if(this.application.ninja.currentDocument !== null){
181 //clear Dirty StyleSheets for the saved document
182 this.application.ninja.stylesController.clearDirtyStyleSheets(this.application.ninja.currentDocument);
183 }
171 } 184 }
172 } 185 }
173 }, 186 },
@@ -249,6 +262,29 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
249 }, 262 },
250 //////////////////////////////////////////////////////////////////// 263 ////////////////////////////////////////////////////////////////////
251 // 264 //
265 saveAsCallback:{
266 value:function(saveAsDetails){
267 var fileUri = null, filename = saveAsDetails.filename, destination = saveAsDetails.destination;
268 //update document metadata
269 this.activeDocument.name = ""+filename;
270 //prepare new file uri
271 if(destination && (destination.charAt(destination.length -1) !== "/")){
272 destination = destination + "/";
273 }
274 fileUri = destination+filename;
275
276 this.activeDocument.uri = fileUri;
277 //save a new file
278 //use the ioMediator.fileSaveAll when implemented
279 this.activeDocument._userDocument.name=filename;
280 this.activeDocument._userDocument.root=destination;
281 this.activeDocument._userDocument.uri=fileUri;
282 this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
283 //
284 }
285 },
286
287 ////////////////////////////////////////////////////////////////////
252 openDocument: { 288 openDocument: {
253 value: function(doc) { 289 value: function(doc) {
254 290
@@ -336,7 +372,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
336 nextDocumentIndex = closeDocumentIndex - 1; 372 nextDocumentIndex = closeDocumentIndex - 1;
337 } 373 }
338 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]); 374 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
339 if(typeof this.activeDocument.stopVideos !== "undefined"){doc.stopVideos();} 375 if(typeof doc.stopVideos !== "undefined"){doc.stopVideos();}
340 this._removeDocumentView(doc.container); 376 this._removeDocumentView(doc.container);
341 }else if(this._documents.length === 0){ 377 }else if(this._documents.length === 0){
342 if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){ 378 if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){
@@ -515,5 +551,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
515 value: function() { 551 value: function() {
516 return "userDocument_" + (this._iframeCounter++); 552 return "userDocument_" + (this._iframeCounter++);
517 } 553 }
554 },
555
556 handleStyleSheetDirty:{
557 value:function(){
558 this.activeDocument.needsSave = true;
518 } 559 }
560 }
519}); 561});
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index ec0335b4..70aba54e 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -51,31 +51,15 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
51 51
52 setAttribute: { 52 setAttribute: {
53 value: function(el, att, value) { 53 value: function(el, att, value) {
54 if(att === "id") {
55 if(value === "") {
56 el.setAttribute(att, value);
57 return;
58 }
59
60 // Then check if this is a valid id by the following spec: http://www.w3.org/TR/REC-html40/types.html#h-6.2
61 var regexID = /^([a-zA-Z])+([a-zA-Z0-9_\.\:\-])+/;
62 if(!regexID.test(value)) {
63 alert("Invalid ID");
64 return;
65 } else if (this.application.ninja.currentDocument._document.getElementById(value) !== null) {
66 alert("The following ID: " + value + " is already in Use");
67 }
68
69 }
70
71 el.setAttribute(att, value); 54 el.setAttribute(att, value);
72 } 55 }
73 }, 56 },
74 57
75 //-------------------------------------------------------------------------------------------------------- 58 //--------------------------------------------------------------------------------------------------------
76 // Routines to get/set color properties 59 // Routines to get/set color properties
60 // borderSide : "top", "right", "bottom", or "left"
77 getColor: { 61 getColor: {
78 value: function(el, isFill) { 62 value: function(el, isFill, borderSide) {
79 var colorObj, 63 var colorObj,
80 color, 64 color,
81 image; 65 image;
@@ -87,22 +71,29 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
87 { 71 {
88 return el.elementModel.fill; 72 return el.elementModel.fill;
89 } 73 }
90// return this.application.ninja.stylesController.getElementStyle(el, "background-color");
91 //TODO: Once logic for color and gradient is established, this needs to be revised 74 //TODO: Once logic for color and gradient is established, this needs to be revised
92 color = this.getProperty(el, "background-color"); 75 color = this.getProperty(el, "background-color");
93 image = this.getProperty(el, "background-image"); 76 image = this.getProperty(el, "background-image");
94 } 77 }
95 else 78 else
96 { 79 {
97 // TODO - Need to figure out which border side user wants 80 // Try getting border color from specific side first
98 if(el.elementModel.stroke) 81 if(borderSide)
99 { 82 {
100 return el.elementModel.stroke; 83 color = this.getProperty(el, "border-" + borderSide + "-color");
84 image = this.getProperty(el, "border-" + borderSide + "-image");
85 }
86
87 // If no color was found, look up the shared border color
88 if(!color && !image)
89 {
90 if(el.elementModel.stroke)
91 {
92 return el.elementModel.stroke;
93 }
94 color = this.getProperty(el, "border-color");
95 image = this.getProperty(el, "border-image");
101 } 96 }
102 // TODO - Need to figure out which border side user wants
103// return this.application.ninja.stylesController.getElementStyle(el, "border-color");
104 color = this.getProperty(el, "border-color");
105 image = this.getProperty(el, "border-image");
106 } 97 }
107 98
108 if(color || image) { 99 if(color || image) {
@@ -120,11 +111,15 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
120 { 111 {
121 el.elementModel.fill = colorObj; 112 el.elementModel.fill = colorObj;
122 } 113 }
123 else 114 else if(!borderSide)
124 { 115 {
125 // TODO - Need to update border style and width also 116 // TODO - Need to update border style and width also
126