diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components')
110 files changed, 1808 insertions, 1925 deletions
diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js index 5a12fcb6..30bba8de 100755 --- a/js/components/SliderBase.js +++ b/js/components/SliderBase.js | |||
| @@ -88,7 +88,7 @@ var SliderBase = exports.SliderBase = Montage.create(Component, { | |||
| 88 | if(this._enabled) | 88 | if(this._enabled) |
| 89 | { | 89 | { |
| 90 | this.element.classList.remove("disabled"); | 90 | this.element.classList.remove("disabled"); |
| 91 | 91 | ||
| 92 | this.element.addEventListener("blur", this); | 92 | this.element.addEventListener("blur", this); |
| 93 | this.element.addEventListener("focus", this); | 93 | this.element.addEventListener("focus", this); |
| 94 | 94 | ||
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html index 0ed468a2..03812deb 100644 --- a/js/components/about-box.reel/about-box.html +++ b/js/components/about-box.reel/about-box.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
diff - | |||