aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/components
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-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')
-rwxr-xr-xjs/components/SliderBase.js2
-rw-r--r--js/components/about-box.reel/about-box.html2
-rwxr-xr-xjs/components/colorbar.reel/colorbar.html48
-rwxr-xr-xjs/components/colorbar.reel/colorbar.js236
-rwxr-xr-xjs/components/colorbar.reel/css/colorbar.scss2
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.html68
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.js710
-rwxr-xr-xjs/components/colorwheel.reel/css/colorwheel.scss6
-rwxr-xr-xjs/components/combobox.reel/combobox.html2
-rwxr-xr-xjs/components/combobox.reel/combobox.js8
-rwxr-xr-xjs/components/core/class-uuid.js4
-rw-r--r--js/components/editable.reel/editable.js38
-rwxr-xr-xjs/components/gradientpicker.reel/css/gradientpicker.scss146
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html109
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js461
-rw-r--r--js/components/hintable.reel/hintable.js72
-rwxr-xr-xjs/components/hottext.reel/hottext.html4
-rwxr-xr-xjs/components/hottext.reel/hottext.js4
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.html2
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html4
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html8
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js32
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html8
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html4
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html2
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html2
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html6
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js2
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html12
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.js2
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html2
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js13
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.css2
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html2
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js30
-rwxr-xr-xjs/components/menu/menu.reel/menu.html4
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.html26
-rwxr-xr-xjs/components/popup-manager.reel/popup-manager.js212
-rwxr-xr-xjs/components/popup.reel/css/popup.scss54
-rwxr-xr-xjs/components/popup.reel/popup.html34
-rwxr-xr-xjs/components/popup.reel/popup.js336
-rw-r--r--js/components/prompt.reel/prompt.js112
-rwxr-xr-xjs/components/radio.reel/radio.html2
-rwxr-xr-xjs/components/radio.reel/radio.js6
-rwxr-xr-xjs/components/slider.reel/slider.html4
-rwxr-xr-xjs/components/slider.reel/slider.js10
-rwxr-xr-xjs/components/textfield.reel/textfield.html2
-rwxr-xr-xjs/components/textfield.reel/textfield.js2
-rw-r--r--js/components/toolbar.reel/toolbar.html6
-rw-r--r--js/components/toolbar.reel/toolbar.js2
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.html10
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.css2
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html6
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.html8
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.js2
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html8
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html4
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css2
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html4
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.html6
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.js2
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.css4
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js6
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.html6
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.js2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js2
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html6
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js2
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html8
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.js2
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html6
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.css2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html12
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js2
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html8
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js2
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css4
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html201
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js319
-rwxr-xr-xjs/components/tools-properties/tool-properties.js2
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html10
-rw-r--r--js/components/treeview/branch.reel/branch.html2
-rw-r--r--js/components/treeview/leaf.reel/leaf.html8
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html6
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.js22
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html8
-rw-r--r--js/components/treeview/treeview.reel/treeview.html12
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html4
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js6
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html2
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.js4
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html2
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js22
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.css2
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html2
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.js18
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html2
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.js4
-rwxr-xr-xjs/components/ui/label-checkbox.reel/label-checkbox.html2
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html2
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.js20
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html2
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.js18
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html2
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.js16
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>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html
index e61cc2f2..e353d860 100755
--- a/js/components/colorbar.reel/colorbar.html
+++ b/js/components/colorbar.reel/colorbar.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- 2<!--
3<copyright> 3<copyright>