aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
authorhwc4872012-04-26 13:04:25 -0700
committerhwc4872012-04-26 13:04:25 -0700
commit37f2d5230175c0fb9a4792f5e3d804f7604442e1 (patch)
treec8260f151270c6bdbe08869ebaeb837777c28d1b /node_modules
parentf13d0f45f6b449764898e99db309c43b51a33476 (diff)
parent902dc18296fc78f3b8e67d952c42981d926bb2fc (diff)
downloadninja-37f2d5230175c0fb9a4792f5e3d804f7604442e1.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'node_modules')
-rw-r--r--node_modules/montage/ui/flow.reel/flow.js1
-rw-r--r--node_modules/montage/ui/youtube-channel.reel/youtube-channel.html1
2 files changed, 2 insertions, 0 deletions
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 {