diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js index 1c1c6054..2353d2a5 100755 --- a/js/components/ui/color-chip.reel/color-chip.js +++ b/js/components/ui/color-chip.reel/color-chip.js @@ -107,9 +107,9 @@ var ColorChip = exports.ColorChip = Montage.create(Component, { var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)"; if(this.color && this.color.color) { - var g = this.color.color; - g.wasSetByCode = true; - this.chipBtn.color(this.color.mode, g); + var g = this.color.color; + g.wasSetByCode = true; + this.chipBtn.color(this.color.mode, g); } else if (this.color) { var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css); mode = colorObj.mode; diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js index e8ea8ba9..66a52b22 100755 --- a/js/components/ui/file-input.reel/file-input.js +++ b/js/components/ui/file-input.reel/file-input.js @@ -71,7 +71,7 @@ var FileInput = exports.FileInput = Montage.create(Component, { handleChange: { value:function(event) - { + { if(event.currentTarget.type === "file") { this.filePath = this.inputField.value; @@ -86,7 +86,7 @@ var FileInput = exports.FileInput = Montage.create(Component, { e.type = "change"; e.filePath = this.filePath; this.dispatchEvent(e); - } + } }, prepareForDraw: { diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js index 11cf3b12..d0954324 100755 --- a/js/components/ui/icon-list-basic/icon.reel/icon.js +++ b/js/components/ui/icon-list-basic/icon.reel/icon.js @@ -70,14 +70,14 @@ exports.Icon = Montage.create(Component, { }, willDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { - } + } }, draw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { if(this.icondata.type === "directory"){ this.iconImg.src = this.imgStore.img_root + this.imgStore.directory; }else{ @@ -91,11 +91,11 @@ exports.Icon = Montage.create(Component, { } this.iconImg.src = fileImg; } - } + } }, didDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { var that = this; var icon = this.iconImg; @@ -131,7 +131,7 @@ exports.Icon = Montage.create(Component, { selectedItemEvent.uri = this.icondata.uri; this.element.dispatchEvent(selectedItemEvent); } - } + } }, /** @@ -195,12 +195,12 @@ exports.Icon = Montage.create(Component, { formatTimestamp:{ writable:false, enumerable: false, - value: function(timestamp) { + value: function(timestamp) { var aDate = new Date(); timestamp = timestamp - (aDate.getTimezoneOffset()*60*1000);//convert from GMT to local timestamp aDate = new Date(timestamp); return aDate.toLocaleString(); - } + } }, imgStore:{ diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js index 8b40f102..c2e2d46f 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js @@ -55,22 +55,22 @@ var IconsList = exports.IconsList = Montage.create(Component, { }, willDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { - } + } }, draw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { - } + } }, didDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { - } + } } }); diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js index 6e0a3916..834702fd 100755 --- a/js/components/ui/property-control.reel/property-control.js +++ b/js/components/ui/property-control.reel/property-control.js @@ -169,15 +169,15 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { }, handleEvent: - { - value:function(event) - { + { + value:function(event) + { if(event.wasSetByCode) { return; } this._dispatchPropEvent(event); - } - }, + } + }, _dispatchPropEvent: { value: function(event) { diff --git a/js/components/ui/tree-basic/tree.reel/tree.js b/js/components/ui/tree-basic/tree.reel/tree.js index 0b161aa6..14472475 100755 --- a/js/components/ui/tree-basic/tree.reel/tree.js +++ b/js/components/ui/tree-basic/tree.reel/tree.js @@ -58,22 +58,22 @@ exports.Tree = Montage.create(Component, { }, willDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { - } + } }, draw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { - } + } }, didDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { - } + } } }); diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.js b/js/components/ui/tree-basic/treeItem.reel/treeItem.js index 1677d514..ffed488e 100755 --- a/js/components/ui/tree-basic/treeItem.reel/treeItem.js +++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.js @@ -76,8 +76,8 @@ exports.TreeItem = Montage.create(Component, { value:null }, willDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { var that = this; this.itemName.innerHTML = this.treeItemData.name; @@ -108,14 +108,14 @@ exports.TreeItem = Montage.create(Component, { } }, draw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { } }, didDraw: { - enumerable: false, - value: function() { + enumerable: false, + value: function() { var that = this; this.element.identifier = "treeItem"; this.treeArrow.identifier = "treeArrow"; @@ -333,12 +333,12 @@ exports.TreeItem = Montage.create(Component, { formatTimestamp:{ writable:false, enumerable: false, - value: function(timestamp) { + value: function(timestamp) { var aDate = new Date(); timestamp = timestamp - (aDate.getTimezoneOffset()*60*1000);//convert from GMT to local timestamp aDate = new Date(timestamp); return aDate.toLocaleString(); - } + } } }); -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/components/ui/input-group.reel/input-group.js | 4 ++-- js/components/ui/property-control.reel/property-control.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'js/components/ui') diff --git a/js/components/ui/input-group.reel/input-group.js b/js/components/ui/input-group.reel/input-group.js index ba0eea43..df3a81c4 100755 --- a/js/components/ui/input-group.reel/input-group.js +++ b/js/components/ui/input-group.reel/input-group.js @@ -84,7 +84,7 @@ var InputGroup = exports.InputGroup = Montage.create(Component, { this.dispatchEvent(propEvent); } }, - + value: { enumerable: true, serializable: true, @@ -96,7 +96,7 @@ var InputGroup = exports.InputGroup = Montage.create(Component, { retObject[childControl.label] = childControl._control[childControl._prop]; } return retObject; - + } }, diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js index 834702fd..9b9c9482 100755 --- a/js/components/ui/property-control.reel/property-control.js +++ b/js/components/ui/property-control.reel/property-control.js @@ -195,7 +195,7 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { propEvent.propertyLabel = this.label; propEvent.propertyValue = event.currentTarget[this._prop]; propEvent.propertyEvent = event; - + this.dispatchEvent(propEvent); } }, -- cgit v1.2.3 From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- js/components/ui/icon-list-basic/iconsList.reel/iconsList.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/components/ui') diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css index e04bdf5d..1b7f2286 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.css @@ -29,5 +29,5 @@ POSSIBILITY OF SUCH DAMAGE. */ .list{ - + } -- cgit v1.2.3 From 9461e7731f91dd03a15b0a62667e722a60c84721 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:44:57 -0700 Subject: Remove byte order markers (BOM) --- js/components/ui/color-chip.reel/color-chip.html | 2 +- js/components/ui/file-input.reel/file-input.html | 2 +- js/components/ui/icon-list-basic/icon.reel/icon.html | 2 +- js/components/ui/icon-list-basic/iconsList.reel/iconsList.html | 2 +- js/components/ui/input-group.reel/input-group.html | 2 +- js/components/ui/property-control.reel/property-control.html | 2 +- js/components/ui/tree-basic/tree.reel/tree.html | 2 +- js/components/ui/tree-basic/treeItem.reel/treeItem.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'js/components/ui') diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html index 482f999c..400e868a 100755 --- a/js/components/ui/color-chip.reel/color-chip.html +++ b/js/components/ui/color-chip.reel/color-chip.html @@ -1,4 +1,4 @@ - +