diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /node_modules/montage/ui/autocomplete | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-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/ui/autocomplete')
3 files changed, 5 insertions, 5 deletions
diff --git a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.html b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.html index c6251e3d..7bb74bf7 100644 --- a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.html +++ b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.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 --git a/node_modules/montage/ui/autocomplete/result-item.reel/result-item.js b/node_modules/montage/ui/autocomplete/result-item.reel/result-item.js index 9a08d4df..1e19bbd3 100644 --- a/node_modules/montage/ui/autocomplete/result-item.reel/result-item.js +++ b/node_modules/montage/ui/autocomplete/result-item.reel/result-item.js | |||
| @@ -32,9 +32,9 @@ var Montage = require("montage").Montage, | |||
| 32 | DynamicText = require("ui/dynamic-text.reel").DynamicText; | 32 | DynamicText = require("ui/dynamic-text.reel").DynamicText; |
| 33 | 33 | ||
| 34 | exports.ResultItem = Montage.create(DynamicText, { | 34 | exports.ResultItem = Montage.create(DynamicText, { |
| 35 | 35 | ||
| 36 | textPropertyPath: {value: null}, | 36 | textPropertyPath: {value: null}, |
| 37 | 37 | ||
| 38 | _object: {value: null}, | 38 | _object: {value: null}, |
| 39 | object: { | 39 | object: { |
| 40 | get: function() { | 40 | get: function() { |
| @@ -42,7 +42,7 @@ exports.ResultItem = Montage.create(DynamicText, { | |||
| 42 | }, | 42 | }, |
| 43 | set: function(aValue) { | 43 | set: function(aValue) { |
| 44 | if(aValue) { | 44 | if(aValue) { |
| 45 | this._object = aValue; | 45 | this._object = aValue; |
| 46 | } | 46 | } |
| 47 | if(this._object) { | 47 | if(this._object) { |
| 48 | if(this.textPropertyPath) { | 48 | if(this.textPropertyPath) { |
diff --git a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html index 124164f7..054eb204 100644 --- a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html +++ b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.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. |