Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts:
	js/components/gradientpicker.reel/gradientpicker.js
	js/components/tools-properties/text-properties.reel/text-properties.js
	js/document/views/base.js
	js/document/views/design.js
	js/helper-classes/3D/StageLine.js
	js/helper-classes/3D/draw-utils.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/line.js
	js/lib/geom/rectangle.js
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/flag-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/water-material.js
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
	js/panels/Materials/materials-popup.reel/materials-popup.html
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/tools/LineTool.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 8 insertions, 8 deletions

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();
-        }
+        }
     }
 
 });