aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-16 11:52:13 -0700
committerPushkar Joshi2012-03-16 11:52:13 -0700
commit1da989027e46102a9dc2aa2b5d764f58b97aa31b (patch)
tree496b8c7952c01b2caae76dda901b4173eedb11d2 /js/controllers
parente574f722864a246bad40d3f5a4e59f7ccb206ea9 (diff)
parent3e98d9eaf6f691aa0f7a4334983537a4ee3ffd39 (diff)
downloadninja-1da989027e46102a9dc2aa2b5d764f58b97aa31b.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js2
-rwxr-xr-xjs/controllers/elements/element-controller.js17
2 files changed, 1 insertions, 18 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 87e93465..7d982a62 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -372,7 +372,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
372 nextDocumentIndex = closeDocumentIndex - 1; 372 nextDocumentIndex = closeDocumentIndex - 1;
373 } 373 }
374 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]); 374 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
375 if(typeof this.activeDocument.stopVideos !== "undefined"){doc.stopVideos();} 375 if(typeof doc.stopVideos !== "undefined"){doc.stopVideos();}
376 this._removeDocumentView(doc.container); 376 this._removeDocumentView(doc.container);
377 }else if(this._documents.length === 0){ 377 }else if(this._documents.length === 0){
378 if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){ 378 if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 9f00604f..70aba54e 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -51,23 +51,6 @@ 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 },