diff options
author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /node_modules/montage/ui/scroll-bars.reel | |
parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to 'node_modules/montage/ui/scroll-bars.reel')
-rwxr-xr-x | node_modules/montage/ui/scroll-bars.reel/scroll-bars.html | 2 | ||||
-rwxr-xr-x | node_modules/montage/ui/scroll-bars.reel/scroll-bars.js | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html index a9d92944..93986b5d 100755 --- a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html +++ b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html | |||
@@ -114,4 +114,4 @@ | |||
114 | </div> | 114 | </div> |
115 | </div> | 115 | </div> |
116 | </body> | 116 | </body> |
117 | </html> \ No newline at end of file | 117 | </html> |
diff --git a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.js b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.js index 48b6a4c9..4a954399 100755 --- a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.js +++ b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.js | |||
@@ -1,9 +1,3 @@ | |||
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, | 1 | var Montage = require("montage").Montage, |
8 | Component = require("ui/component").Component; | 2 | Component = require("ui/component").Component; |
9 | 3 | ||
@@ -75,7 +69,7 @@ var ScrollBars = exports.ScrollBars = Montage.create(Component, { | |||
75 | enumerable: false, | 69 | enumerable: false, |
76 | value: 0 | 70 | value: 0 |
77 | }, | 71 | }, |
78 | 72 | ||
79 | opacity: { | 73 | opacity: { |
80 | get: function () { | 74 | get: function () { |
81 | return this._opacity; | 75 | return this._opacity; |
@@ -85,7 +79,7 @@ var ScrollBars = exports.ScrollBars = Montage.create(Component, { | |||
85 | this.needsDraw = true; | 79 | this.needsDraw = true; |
86 | } | 80 | } |
87 | }, | 81 | }, |
88 | 82 | ||
89 | _isDisplayUpdated: { | 83 | _isDisplayUpdated: { |
90 | enumerable: false, | 84 | enumerable: false, |
91 | value: false | 85 | value: false |
@@ -174,7 +168,7 @@ var ScrollBars = exports.ScrollBars = Montage.create(Component, { | |||
174 | this._bottomClip.style.height = this._bottom.style.height = (this._offsetHeight - 4) + "px"; | 168 | this._bottomClip.style.height = this._bottom.style.height = (this._offsetHeight - 4) + "px"; |
175 | this._bottomClip.style.clip = "rect(3px,6px," + (this._offsetHeight - 3) + "px,-1px)"; | 169 | this._bottomClip.style.clip = "rect(3px,6px," + (this._offsetHeight - 3) + "px,-1px)"; |
176 | this._hasResizedVertical = false; | 170 | this._hasResizedVertical = false; |
177 | } | 171 | } |
178 | if (this._opacity) { | 172 | if (this._opacity) { |
179 | if (this._displayHorizontal) { | 173 | if (this._displayHorizontal) { |
180 | range = this._offsetWidth - 9 - (this._displayVertical ? 6 : 0); | 174 | range = this._offsetWidth - 9 - (this._displayVertical ? 6 : 0); |
@@ -244,4 +238,4 @@ var ScrollBars = exports.ScrollBars = Montage.create(Component, { | |||
244 | } | 238 | } |
245 | } | 239 | } |
246 | } | 240 | } |
247 | }); \ No newline at end of file | 241 | }); |