aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /node_modules/montage
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage')
-rwxr-xr-xnode_modules/montage/core/converter/bytes-converter.js2
-rwxr-xr-xnode_modules/montage/core/converter/currency-converter.js2
-rwxr-xr-xnode_modules/montage/core/converter/date-converter.js18
-rwxr-xr-xnode_modules/montage/core/converter/lower-case-converter.js2
-rwxr-xr-xnode_modules/montage/core/converter/new-line-to-br-converter.js2
-rwxr-xr-xnode_modules/montage/core/converter/number-converter.js2
-rwxr-xr-xnode_modules/montage/core/converter/trim-converter.js2
-rwxr-xr-xnode_modules/montage/core/exception.js2
-rwxr-xr-xnode_modules/montage/core/extras/string.js2
-rwxr-xr-xnode_modules/montage/core/gate.js2
-rwxr-xr-xnode_modules/montage/core/geometry/cubic-bezier.js2
-rwxr-xr-xnode_modules/montage/core/geometry/point.js2
-rwxr-xr-xnode_modules/montage/core/logger.js12
-rwxr-xr-xnode_modules/montage/core/state-chart.js2
-rwxr-xr-xnode_modules/montage/core/uuid.js2
-rwxr-xr-xnode_modules/montage/data/control-listener.js2
-rwxr-xr-xnode_modules/montage/data/ldap-access/ldap-object-id.js2
-rwxr-xr-xnode_modules/montage/data/nosql-access/nosql-object-id.js2
-rwxr-xr-xnode_modules/montage/data/rest-access/rest-object-id.js2
-rwxr-xr-xnode_modules/montage/data/sql-access/sql-object-id.js2
-rw-r--r--node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.html2
-rw-r--r--node_modules/montage/ui/autocomplete/result-item.reel/result-item.js6
-rw-r--r--node_modules/montage/ui/autocomplete/results-list.reel/results-list.html2
-rw-r--r--node_modules/montage/ui/bluemoon/button-group.reel/button-group.html2
-rw-r--r--node_modules/montage/ui/bluemoon/button-group.reel/button-group.js2
-rw-r--r--node_modules/montage/ui/bluemoon/button.reel/button.html2
-rw-r--r--node_modules/montage/ui/bluemoon/button.reel/button.js2
-rw-r--r--node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.css2
-rw-r--r--node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.html2
-rw-r--r--node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js2
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.css38
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.html8
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.js2
-rw-r--r--node_modules/montage/ui/bluemoon/slider.reel/slider.html2
-rwxr-xr-xnode_modules/montage/ui/bluemoon/tabs.reel/tabs.html2
-rwxr-xr-xnode_modules/montage/ui/bluemoon/tabs.reel/tabs.js2
-rw-r--r--node_modules/montage/ui/bluemoon/textarea.reel/textarea.html2
-rw-r--r--node_modules/montage/ui/bluemoon/textarea.reel/textarea.js2
-rw-r--r--node_modules/montage/ui/bluemoon/textfield.reel/textfield.html2
-rw-r--r--node_modules/montage/ui/bluemoon/textfield.reel/textfield.js2
-rw-r--r--node_modules/montage/ui/bluemoon/toggle.reel/toggle.html2
-rw-r--r--node_modules/montage/ui/bluemoon/toggle.reel/toggle.js2
-rw-r--r--node_modules/montage/ui/button.reel/button.css2
-rw-r--r--node_modules/montage/ui/button.reel/button.html2
-rwxr-xr-xnode_modules/montage/ui/component-group.reel/component-group.js2
-rwxr-xr-xnode_modules/montage/ui/component.js2
-rw-r--r--node_modules/montage/ui/composer/composer.js2
-rw-r--r--node_modules/montage/ui/composer/press-composer.js2
-rw-r--r--node_modules/montage/ui/composer/swipe-composer.js2
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js2
-rwxr-xr-xnode_modules/montage/ui/controller/media-controller.js2
-rwxr-xr-xnode_modules/montage/ui/dynamic-text.reel/dynamic-text.js2
-rwxr-xr-xnode_modules/montage/ui/editable-text.js2
-rw-r--r--node_modules/montage/ui/flow.reel/flow.html2
-rw-r--r--node_modules/montage/ui/flow.reel/flow.js10
-rw-r--r--node_modules/montage/ui/input-checkbox.reel/input-checkbox.html2
-rw-r--r--node_modules/montage/ui/input-checkbox.reel/input-checkbox.js10
-rw-r--r--node_modules/montage/ui/input-date.reel/input-date.html2
-rw-r--r--node_modules/montage/ui/input-number.reel/input-number.html4
-rw-r--r--node_modules/montage/ui/input-radio.reel/input-radio.css10
-rw-r--r--node_modules/montage/ui/input-radio.reel/input-radio.html2
-rw-r--r--node_modules/montage/ui/input-range.reel/input-range.css2
-rw-r--r--node_modules/montage/ui/input-range.reel/input-range.html2
-rw-r--r--node_modules/montage/ui/input-text.reel/input-text.html2
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.html2
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.js2
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.html2
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.js6
-rwxr-xr-xnode_modules/montage/ui/loading.reel/loading.html2
-rwxr-xr-xnode_modules/montage/ui/loading.reel/loading.js2
-rw-r--r--node_modules/montage/ui/native/anchor.reel/anchor.js2
-rw-r--r--node_modules/montage/ui/native/input-date.reel/input-date.js20
-rw-r--r--node_modules/montage/ui/native/input-number.reel/input-number.js18
-rwxr-xr-xnode_modules/montage/ui/popup/alert.reel/alert.html2
-rwxr-xr-xnode_modules/montage/ui/popup/confirm.reel/confirm.html2
-rwxr-xr-xnode_modules/montage/ui/popup/notifier.reel/notifier.html2
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.css12
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.html2
-rw-r--r--node_modules/montage/ui/progress.reel/progress.html8
-rwxr-xr-xnode_modules/montage/ui/repetition.reel/repetition.js2
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html2
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js2
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html2
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js2
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js2
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html2
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-sanitizer.js2
-rw-r--r--node_modules/montage/ui/scroll-bars.reel/scroll-bars.html2
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.css2
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.html2
-rw-r--r--node_modules/montage/ui/select.reel/select.css6
-rw-r--r--node_modules/montage/ui/select.reel/select.html2
-rwxr-xr-xnode_modules/montage/ui/slot.reel/slot.js2
-rwxr-xr-xnode_modules/montage/ui/substitution.reel/substitution.js2
-rw-r--r--node_modules/montage/ui/text-slider.reel/text-slider.html2
-rw-r--r--node_modules/montage/ui/textarea.reel/textarea.css6
-rw-r--r--node_modules/montage/ui/textarea.reel/textarea.html2
-rw-r--r--node_modules/montage/ui/toggle-button.reel/toggle-button.html2
-rwxr-xr-xnode_modules/montage/ui/toggle-switch.reel/toggle-switch.html2
-rw-r--r--node_modules/montage/ui/token-field/token-field.reel/token-field.html2
-rw-r--r--node_modules/montage/ui/token-field/token.reel/token.css2
-rw-r--r--node_modules/montage/ui/token-field/token.reel/token.html4
-rwxr-xr-xnode_modules/montage/ui/video-player.reel/video-player.css50
-rwxr-xr-xnode_modules/montage/ui/video-player.reel/video-player.html2
-rwxr-xr-xnode_modules/montage/ui/video-player.reel/video-player.js2
105 files changed, 210 insertions, 210 deletions
diff --git a/node_modules/montage/core/converter/bytes-converter.js b/node_modules/montage/core/converter/bytes-converter.js
index 84511924..17a4390c 100755
--- a/node_modules/montage/core/converter/bytes-converter.js
+++ b/node_modules/montage/core/converter/bytes-converter.js
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE. 28POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30/** 30/**
31 @module montage/core/converter/bytes-converter 31 @module montage/core/converter/bytes-converter
32 @requires montage/core/core 32 @requires montage/core/core
33 @requires montage/core/converter/converter 33 @requires montage/core/converter/converter
34 @requires montage/core/converter/number-converter 34 @requires montage/core/converter/number-converter
diff --git a/node_modules/montage/core/converter/currency-converter.js b/node_modules/montage/core/converter/currency-converter.js
index ca32fe7e..712ce306 100755
--- a/node_modules/montage/core/converter/currency-converter.js
+++ b/node_modules/montage/core/converter/currency-converter.js
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE. 28POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30/** 30/**
31 @module montage/core/converter/currency-converter 31 @module montage/core/converter/currency-converter
32 @requires montage/core/core 32 @requires montage/core/core
33 @requires montage/core/converter/converter 33 @requires montage/core/converter/converter
34 @requires montage/core/converter/number-converter 34 @requires montage/core/converter/number-converter
diff --git a/node_modules/montage/core/converter/date-converter.js b/node_modules/montage/core/converter/date-converter.js
index 38ad8f96..0c0ae09a 100755
--- a/node_modules/montage/core/converter/date-converter.js
+++ b/node_modules/montage/core/converter/date-converter.js
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.