diff options
author | hwc487 | 2012-05-11 13:52:55 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 13:52:55 -0700 |
commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /node_modules/montage/ui/scroller.reel | |
parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'node_modules/montage/ui/scroller.reel')
-rw-r--r-- | node_modules/montage/ui/scroller.reel/scroller.html | 26 | ||||
-rw-r--r-- | node_modules/montage/ui/scroller.reel/scroller.js | 21 |
2 files changed, 19 insertions, 28 deletions
diff --git a/node_modules/montage/ui/scroller.reel/scroller.html b/node_modules/montage/ui/scroller.reel/scroller.html index fc59297f..1663c26b 100644 --- a/node_modules/montage/ui/scroller.reel/scroller.html +++ b/node_modules/montage/ui/scroller.reel/scroller.html | |||
@@ -10,8 +10,7 @@ | |||
10 | <script type="text/montage-serialization">{ | 10 | <script type="text/montage-serialization">{ |
11 | 11 | ||
12 | "scrollbars": { | 12 | "scrollbars": { |
13 | "module": "montage/ui/scroll-bars.reel", | 13 | "prototype": "montage/ui/scroll-bars.reel", |
14 | "name": "ScrollBars", | ||
15 | "properties": { | 14 | "properties": { |
16 | "element": { | 15 | "element": { |
17 | "#": "scrollbars" | 16 | "#": "scrollbars" |
@@ -19,20 +18,20 @@ | |||
19 | } | 18 | } |
20 | }, | 19 | }, |
21 | "translateComposer1": { | 20 | "translateComposer1": { |
22 | "module": "montage/ui/composer/translate-composer", | 21 | "prototype": "montage/ui/composer/translate-composer", |
23 | "name": "TranslateComposer", | ||
24 | "properties": { | 22 | "properties": { |
25 | "component": {"@": "owner"}, | 23 | "component": {"@": "owner"}, |
24 | "minTranslateX": 0, | ||
25 | "minTranslateY": 0, | ||
26 | "invertAxis": true | 26 | "invertAxis": true |
27 | }, | 27 | }, |
28 | "bindings": { | 28 | "bindings": { |
29 | "translateX": {"<<->": "@owner.scrollX"}, | 29 | "translateX": {"<<->": "@owner.scrollX"}, |
30 | "translateY": {"<<->": "@owner.scrollY"}, | 30 | "translateY": {"<<->": "@owner.scrollY"}, |
31 | "maxTranslateY": {"<<->": "@owner._maxTranslateY"}, | 31 | "maxTranslateX": {"<-": "@owner._maxTranslateX"}, |
32 | "maxTranslateX": {"<<->": "@owner._maxTranslateX"}, | 32 | "maxTranslateY": {"<-": "@owner._maxTranslateY"}, |
33 | "axis": {"<<->": "@owner.axis"}, | 33 | "axis": {"<-": "@owner.axis"}, |
34 | "hasBouncing": {"<<->": "@owner.hasBouncing"}, | 34 | "hasMomentum": {"<-": "@owner.hasMomentum"} |
35 | "hasMomentum": {"<<->": "@owner.hasMomentum"} | ||
36 | }, | 35 | }, |
37 | "listeners": [ | 36 | "listeners": [ |
38 | { | 37 | { |
@@ -46,8 +45,7 @@ | |||
46 | ] | 45 | ] |
47 | }, | 46 | }, |
48 | "owner": { | 47 | "owner": { |
49 | "module": "montage/ui/scroller.reel", | 48 | "prototype": "montage/ui/scroller.reel", |
50 | "name": "Scroller", | ||
51 | "properties": { | 49 | "properties": { |
52 | "_content": { | 50 | "_content": { |
53 | "#": "content" | 51 | "#": "content" |
@@ -75,9 +73,9 @@ | |||
75 | </style> | 73 | </style> |
76 | </head> | 74 | </head> |
77 | <body> | 75 | <body> |
78 | <div id="montage-scroller" class="montage-scroller"> | 76 | <div data-montage-id="montage-scroller" class="montage-scroller"> |
79 | <div id="scrollbars"></div> | 77 | <div data-montage-id="scrollbars"></div> |
80 | <div id="content" class="content"></div> | 78 | <div data-montage-id="content" class="content"></div> |
81 | </div> | 79 | </div> |
82 | </body> | 80 | </body> |
83 | </html> | 81 | </html> |
diff --git a/node_modules/montage/ui/scroller.reel/scroller.js b/node_modules/montage/ui/scroller.reel/scroller.js index 8c367cd1..87218aeb 100644 --- a/node_modules/montage/ui/scroller.reel/scroller.js +++ b/node_modules/montage/ui/scroller.reel/scroller.js | |||
@@ -101,20 +101,6 @@ exports.Scroller = Montage.create(Component, { | |||
101 | } | 101 | } |
102 | }, | 102 | }, |
103 | 103 | ||
104 | _hasBouncing: { | ||
105 | enumerable: false, | ||
106 | value: true | ||
107 | }, | ||
108 | |||
109 | hasBouncing: { | ||
110 | get: function () { | ||
111 | return this._hasBouncing; | ||
112 | }, | ||
113 | set: function (value) { | ||
114 | this._hasBouncing = value; | ||
115 | } | ||
116 | }, | ||
117 | |||
118 | _content: { | 104 | _content: { |
119 | enumerable: false, | 105 | enumerable: false, |
120 | value: null | 106 | value: null |
@@ -147,6 +133,13 @@ exports.Scroller = Montage.create(Component, { | |||
147 | } | 133 | } |
148 | }, | 134 | }, |
149 | 135 | ||
136 | canDraw: { | ||
137 | value: function() { | ||
138 | this.needsDraw = true; | ||
139 | return Component.canDraw.apply(this, arguments); | ||
140 | } | ||
141 | }, | ||
142 | |||
150 | willDraw: { | 143 | willDraw: { |
151 | enumerable: false, | 144 | enumerable: false, |
152 | value: function () { | 145 | value: function () { |