diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/ui/tree-basic | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/ui/tree-basic')
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> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All 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> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All 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 | }); |