aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/tree-basic
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/ui/tree-basic
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
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>
Diffstat (limited to 'js/components/ui/tree-basic')
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html2
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.js18
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html2
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.js16
4 files changed, 19 insertions, 19 deletions
diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html
index d4794893..e4da2171 100755
--- a/js/components/ui/tree-basic/tree.reel/tree.html
+++ b/js/components/ui/tree-basic/tree.reel/tree.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
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, {
58 }, 58 },
59 59
60 willDraw: { 60 willDraw: {
61 enumerable: false, 61 enumerable: false,
62 value: function() { 62 value: function() {
63 63
64 } 64 }
65 }, 65 },
66 draw: { 66 draw: {
67 enumerable: false, 67 enumerable: false,
68 value: function() { 68 value: function() {
69 69
70 } 70 }
71 }, 71 },
72 didDraw: { 72 didDraw: {
73 enumerable: false, 73 enumerable: false,
74 value: function() { 74 value: function() {
75 75
76 } 76 }
77 } 77 }
78 78
79}); 79});
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.html b/js/components/ui/tree-basic/treeItem.reel/treeItem.html
index d05dae04..03c05846 100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.html
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
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, {
76 value:null 76 value:null
77 }, 77 },
78 willDraw: { 78 willDraw: {
79 enumerable: false, 79 enumerable: false,
80 value: function() { 80 value: function() {
81 var that = this; 81 var that = this;
82 this.itemName.innerHTML = this.treeItemData.name; 82 this.itemName.innerHTML = this.treeItemData.name;
83 83
@@ -108,14 +108,14 @@ exports.TreeItem = Montage.create(Component, {
108 } 108 }
109 }, 109 },
110 draw: { 110 draw: {
111 enumerable: false, 111 enumerable: false,
112 value: function() { 112 value: function() {
113 113
114 } 114 }
115 }, 115 },
116 didDraw: { 116 didDraw: {
117 enumerable: false, 117 enumerable: false,
118 value: function() { 118 value: function() {
119 var that = this; 119 var that = this;
120 this.element.identifier = "treeItem"; 120 this.element.identifier = "treeItem";
121 this.treeArrow.identifier = "treeArrow"; 121 this.treeArrow.identifier = "treeArrow";
@@ -333,12 +333,12 @@ exports.TreeItem = Montage.create(Component, {
333 formatTimestamp:{ 333 formatTimestamp:{
334 writable:false, 334 writable:false,
335 enumerable: false, 335 enumerable: false,
336 value: function(timestamp) { 336 value: function(timestamp) {
337 var aDate = new Date(); 337 var aDate = new Date();
338 timestamp = timestamp - (aDate.getTimezoneOffset()*60*1000);//convert from GMT to local timestamp 338 timestamp = timestamp - (aDate.getTimezoneOffset()*60*1000);//convert from GMT to local timestamp
339 aDate = new Date(timestamp); 339 aDate = new Date(timestamp);
340 return aDate.toLocaleString(); 340 return aDate.toLocaleString();
341 } 341 }
342 } 342 }
343 343
344}); 344});