diff options
author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /node_modules/montage/ui/image3d.reel/image3d.js | |
parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'node_modules/montage/ui/image3d.reel/image3d.js')
-rw-r--r-- | node_modules/montage/ui/image3d.reel/image3d.js | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/node_modules/montage/ui/image3d.reel/image3d.js b/node_modules/montage/ui/image3d.reel/image3d.js deleted file mode 100644 index d9b7b302..00000000 --- a/node_modules/montage/ui/image3d.reel/image3d.js +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | var Montage = require("montage").Montage, | ||
8 | Component = require("ui/component").Component; | ||
9 | |||
10 | var Image3D = exports.Image3D = Montage.create(Component, { | ||
11 | |||
12 | _data: {value: null}, | ||
13 | |||
14 | data: { | ||
15 | set: function(value) { | ||
16 | this._data = value; | ||
17 | this.needsDraw = true; | ||
18 | } | ||
19 | }, | ||
20 | |||
21 | draw: { | ||
22 | value: function() { | ||
23 | this._element.style.background = "url(" + this._data["src"] + ")"; | ||
24 | this.left.textContent = this._data["text"]; | ||
25 | this.right.textContent = this._data["text"]; | ||
26 | //this.left.style.background = "-webkit-gradient(linear, left top, left bottom, from(rgba(50,50,50,.7)), color-stop(10%, rgba(10,10,10,.5)), to(black)) left top no-repeat, url(" + this._src + ") left top no-repeat"; | ||
27 | //this.left.style.backgroundSize="10000% 10000%"; | ||
28 | } | ||
29 | } | ||
30 | }); \ No newline at end of file | ||