diff options
author | Jon Reid | 2012-05-18 15:05:50 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-18 15:05:50 -0700 |
commit | 6c4f58ab9dd2f60d509d3e1c1ba0c94a6995691d (patch) | |
tree | b555c40a0276052e6109d98a5ec23358759985f2 /js/panels/properties.reel | |
parent | ef499e92341c9bd6edbee70f86dc5a6fe8b461eb (diff) | |
download | ninja-6c4f58ab9dd2f60d509d3e1c1ba0c94a6995691d.tar.gz |
Timeline: Fix element insertion to use new TimelinePanel properties and
multiselect. Fix Property Panel so changing an ID there will actually change
an ID on the element (broken by switch from id to data-montage-id change).
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-x | js/panels/properties.reel/properties.js | 5 |
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 { |