aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-05-22 10:33:10 -0700
committerJonathan Duran2012-05-22 10:33:10 -0700
commit0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (patch)
tree1c78ccc588f04bac9bff4de82e527a128162cf4f /js/panels/properties.reel
parent7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (diff)
parent119fec85a659cc470377032abab8c6e60fa55b1b (diff)
downloadninja-0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 507770f6..9af9253b 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -101,8 +101,7 @@ exports.Properties = Montage.create(Component, {
101 */ 101 */
102 handleBlur: { 102 handleBlur: {
103 value: function(event) { 103 value: function(event) {
104 if(event.target.id === "elementId") { 104 if(event.target.dataset.montageId === "elementId") {
105
106 // Remove all white spaces from the id 105 // Remove all white spaces from the id
107 this.elementId.value = this.elementId.value.replace(/\s/g, ''); 106 this.elementId.value = this.elementId.value.replace(/\s/g, '');
108 107
@@ -118,7 +117,7 @@ exports.Properties = Montage.create(Component, {
118 } else { 117 } else {
119 ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "id", this.elementId.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.id); 118 ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "id", this.elementId.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.id);
120 } 119 }
121 } else if(event.target.id === "elementClass") { 120 } else if(event.target.dataset.montageId === "elementClass") {
122 if(this.application.ninja.selectedElements.length) { 121 if(this.application.ninja.selectedElements.length) {
123 ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "class", this.elementClass.value, this.application.ninja.selectedElements[0].className, "pi"); 122 ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "class", this.elementClass.value, this.application.ninja.selectedElements[0].className, "pi");
124 } else { 123 } else {