Merge branch 'refs/heads/master' into binding

1 files changed, 2 insertions, 2 deletions

diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index e3ecce10..84b0d589 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -89,7 +89,7 @@ exports.Properties = Montage.create(Component, {
     handleBlur: {
         value: function(event) {
 
-            if(event.target.id === "elementId") {
+            if(event.target === this.elementId.element) {
 
                 // Remove all white spaces from the id
                 this.elementId.value = this.elementId.value.replace(/\s/g, '');
@@ -106,7 +106,7 @@ exports.Properties = Montage.create(Component, {
                 } else {
                     ElementsMediator.setAttribute(this.application.ninja.currentDocument.model.documentRoot, "id", this.elementId.value, "Change", "pi", this.application.ninja.currentDocument.model.documentRoot.elementModel.id);
                 }
-            } else if(event.target.id === "elementClass") {
+            } else if(event.target === this.elementClass.element) {
                 if(this.application.ninja.selectedElements.length) {
                     ElementsMediator.setAttribute(this.application.ninja.selectedElements[0], "class", this.elementClass.value, this.application.ninja.selectedElements[0].className, "pi");
                 } else {