aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic/icon.reel
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/icon-list-basic/icon.reel
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/icon-list-basic/icon.reel')
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html2
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js22
2 files changed, 12 insertions, 12 deletions
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html
index 2ae24b10..0c192673 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.html
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.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/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, {
70 }, 70 },
71 71
72 willDraw: { 72 willDraw: {
73 enumerable: false, 73 enumerable: false,
74 value: function() { 74 value: function() {
75 75
76 } 76 }
77 }, 77 },
78 draw: { 78 draw: {
79 enumerable: false, 79 enumerable: false,
80 value: function() { 80 value: function() {
81 if(this.icondata.type === "directory"){ 81 if(this.icondata.type === "directory"){
82 this.iconImg.src = this.imgStore.img_root + this.imgStore.directory; 82 this.iconImg.src = this.imgStore.img_root + this.imgStore.directory;
83 }else{ 83 }else{
@@ -91,11 +91,11 @@ exports.Icon = Montage.create(Component, {
91 } 91 }
92 this.iconImg.src = fileImg; 92 this.iconImg.src = fileImg;
93 } 93 }
94 } 94 }
95 }, 95 },
96 didDraw: { 96 didDraw: {
97 enumerable: false, 97 enumerable: false,
98 value: function() { 98 value: function() {
99 var that = this; 99 var that = this;
100 100
101 var icon = this.iconImg; 101 var icon = this.iconImg;
@@ -131,7 +131,7 @@ exports.Icon = Montage.create(Component, {
131 selectedItemEvent.uri = this.icondata.uri; 131 selectedItemEvent.uri = this.icondata.uri;
132 this.element.dispatchEvent(selectedItemEvent); 132 this.element.dispatchEvent(selectedItemEvent);
133 } 133 }
134 } 134 }
135 }, 135 },
136 136
137 /** 137 /**
@@ -195,12 +195,12 @@ exports.Icon = Montage.create(Component, {
195 formatTimestamp:{ 195 formatTimestamp:{
196 writable:false, 196 writable:false,
197 enumerable: false, 197 enumerable: false,
198 value: function(timestamp) { 198 value: function(timestamp) {
199 var aDate = new Date(); 199 var aDate = new Date();
200 timestamp = timestamp - (aDate.getTimezoneOffset()*60*1000);//convert from GMT to local timestamp 200 timestamp = timestamp - (aDate.getTimezoneOffset()*60*1000);//convert from GMT to local timestamp
201 aDate = new Date(timestamp); 201 aDate = new Date(timestamp);
202 return aDate.toLocaleString(); 202 return aDate.toLocaleString();
203 } 203 }
204 }, 204 },
205 205
206 imgStore:{ 206 imgStore:{