diff options
author | Jonathan Duran | 2012-04-23 09:54:54 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-23 09:54:54 -0700 |
commit | e9b7e10b03cfe20ad145cb8b9cb8710a1917fb35 (patch) | |
tree | f95925d626cd5b585e6718407a31d8e5d62daee7 | |
parent | f1e01ab5c62bad8bcaf6c033cb251b889362f01d (diff) | |
parent | 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff) | |
download | ninja-e9b7e10b03cfe20ad145cb8b9cb8710a1917fb35.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
-rw-r--r-- | manifest.json | 2 | ||||
-rw-r--r-- | node_modules/montage/ui/flow.reel/flow.js | 1 | ||||
-rw-r--r-- | node_modules/montage/ui/youtube-channel.reel/youtube-channel.html | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json index 42fe43f4..b46c9826 100644 --- a/manifest.json +++ b/manifest.json | |||
@@ -15,7 +15,7 @@ | |||
15 | "notifications", | 15 | "notifications", |
16 | "webRequest", | 16 | "webRequest", |
17 | "webRequestBlocking", | 17 | "webRequestBlocking", |
18 | "http://localhost:/" | 18 | "http://ninja/*" |
19 | ], | 19 | ], |
20 | "requirements": { | 20 | "requirements": { |
21 | "3D": { | 21 | "3D": { |
diff --git a/node_modules/montage/ui/flow.reel/flow.js b/node_modules/montage/ui/flow.reel/flow.js index 929e61b8..2137f782 100644 --- a/node_modules/montage/ui/flow.reel/flow.js +++ b/node_modules/montage/ui/flow.reel/flow.js | |||
@@ -786,6 +786,7 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
786 | } else { | 786 | } else { |
787 | this._objectsForRepetition = value; | 787 | this._objectsForRepetition = value; |
788 | } | 788 | } |
789 | this.needsDraw = true; | ||
789 | } | 790 | } |
790 | }, | 791 | }, |
791 | 792 | ||
diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html index 848322e0..88fc3889 100644 --- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html | |||
@@ -58,6 +58,7 @@ | |||
58 | .montage-youtube-channel { | 58 | .montage-youtube-channel { |
59 | width: 370px; | 59 | width: 370px; |
60 | position: relative; | 60 | position: relative; |
61 | -webkit-transform-style: preserve-3d; | ||
61 | } | 62 | } |
62 | 63 | ||
63 | .montage-youtube-channel img { | 64 | .montage-youtube-channel img { |