diff options
author | Valerio Virgillito | 2012-05-16 01:00:22 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-16 01:00:22 -0700 |
commit | f9f8fdc3000042ba5b4504d91870dc9a32ef25eb (patch) | |
tree | 606f22568ad2be0f7aed266a4d20de576f44002f /js | |
parent | a9672abd32c2e03b8607c1af4903c90f7ff9531c (diff) | |
download | ninja-f9f8fdc3000042ba5b4504d91870dc9a32ef25eb.tar.gz |
Squashed master into dom-architecture
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-x | js/controllers/styles-controller.js | 4 | ||||
-rw-r--r-- | js/controllers/tree-controller.js | 185 | ||||
-rwxr-xr-x | js/document/templates/banner/package.json | 3 | ||||
-rw-r--r-- | js/io/system/ninjalibrary.js | 28 | ||||
-rw-r--r-- | js/io/system/ninjalibrary.json | 4 | ||||
-rwxr-xr-x | js/lib/drawing/world.js | 6 | ||||
-rwxr-xr-x | js/lib/geom/brush-stroke.js | 2 | ||||
-rwxr-xr-x | js/lib/geom/circle.js | 1433 | ||||
-rwxr-xr-x | js/lib/geom/geom-obj.js | 852 | ||||
-rwxr-xr-x | js/lib/geom/line.js | 914 | ||||
-rwxr-xr-x | js/lib/geom/rectangle.js | 1409 | ||||
-rwxr-xr-x | js/lib/geom/sub-path.js | 2 | ||||
-rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 2 | ||||
-rw-r--r-- | js/panels/presets/animations-presets.reel/animations-presets.html | 5 | ||||
-rw-r--r-- | js/panels/presets/style-presets.reel/style-presets.html | 2 | ||||
-rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.html | 5 | ||||
-rwxr-xr-x | js/tools/LineTool.js | 3 | ||||
-rwxr-xr-x | js/tools/OvalTool.js | 2 | ||||
-rwxr-xr-x | js/tools/RectTool.js | 2 | ||||
-rwxr-xr-x | js/tools/TextTool.js | 40 |
20 files changed, 2438 insertions, 2465 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index 7707a826..26485508 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
@@ -795,7 +795,9 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
795 | ///// method to apply/test the new value | 795 | ///// method to apply/test the new value |
796 | dec.setProperty(property, value, priority); | 796 | dec.setProperty(property, value, priority); |
797 | 797 | ||
798 | this.styleSheetModified(rule.parentStyleSheet); | 798 | if(rule.parentStyleSheet) { |
799 | this.styleSheetModified(rule.parentStyleSheet); | ||
800 | } | ||
799 | 801 | ||
800 | ///// Return browser value for value we just set | 802 | ///// Return browser value for value we just set |
801 | return dec.getPropertyValue(property); | 803 | return dec.getPropertyValue(property); |
diff --git a/js/controllers/tree-controller.js b/js/controllers/tree-controller.js deleted file mode 100644 index 2b2e910c..00000000 --- a/js/controllers/tree-controller.js +++ /dev/null | |||
@@ -1,185 +0,0 @@ | |||
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 | @module montage/ui/controller/tree-controller | ||
8 | @requires montage/core/core | ||
9 | @requires montage/ui/controller/object-controller | ||
10 | @requires montage/core/event/mutable-event | ||
11 | */ | ||
12 | var Montage = require("montage").Montage, | ||
13 | ObjectController = require("montage/ui/controller/object-controller").ObjectController, | ||
14 | ArrayController = require("montage/ui/controller/array-controller").ArrayController, | ||
15 | MutableEvent = require("montage/core/event/mutable-event").MutableEvent; | ||
16 | /** | ||
17 | TODO: Write description like the array controllers: The ArrayController helps with organizing a hierarchical | ||
18 | collection of objects, and managing user selection within that collection. | ||
19 | You can assign a TreeController instance as the <code>contentProvider</code> property for a TreeView object. | ||
20 | @class module:montage/ui/controller/tree-controller.TreeController | ||
21 | @classdesc | ||
22 | @extends module:montage/ui/controller/object-controller.ObjectController | ||
23 | */ | ||
24 | var TreeController = exports.TreeController = Montage.create(ObjectController, /** @lends module:montage/ui/controller/tree-controller.TreeController# */ { | ||
25 | |||
26 | rootKey : { | ||
27 | value: null | ||
28 | }, | ||
29 | |||
30 | branchKey : { | ||
31 | value: 'children' | ||
32 | }, | ||
33 | |||
34 | _root : { | ||
35 | value : null | ||
36 | }, | ||
37 | root : { | ||
38 | get: function() { | ||
39 | return this._root; | ||
40 | }, | ||
41 | set: function(value) { | ||
42 | this._root = value; | ||
43 | |||
44 | this.initArrayControllers(); | ||
45 | } | ||
46 | }, | ||
47 | |||
48 | rootController: { | ||
49 | value: null | ||
50 | }, | ||
51 | |||
52 | initArrayControllers : { | ||
53 | value: function() { | ||
54 | var self = this; | ||
55 | |||
56 | ///// Recursive function that finds all branch nodes and initializes | ||
57 | ///// sets the tree node type to "branch" or "leaf" | ||
58 | |||
59 | function walk(node, init, depth) { | ||
60 | var branch = node[self.branchKey]; | ||
61 | |||
62 | if(branch) { | ||
63 | branch.forEach(function(node) { | ||
64 | walk(node, init, ++depth); | ||
65 | }); | ||
66 | |||
67 | node['treeNodeType'] = 'branch'; | ||
68 | } else { | ||
69 | node['treeNodeType'] = 'leaf'; | ||
70 | } | ||
71 | } | ||
72 | |||
73 | walk(this._root, 0); | ||
74 | |||
75 | } | ||
76 | }, | ||
77 | |||
78 | /** | ||
79 | @private | ||
80 | */ | ||
81 | _selectedIndexes: { | ||
82 | value: null, | ||
83 | enumerable: false | ||
84 | }, | ||
85 | |||
86 | /** | ||
87 | Description TODO | ||
88 | @type {Function} | ||
89 | @default null | ||
90 | */ | ||
91 | selectedIndexes: { | ||
92 | get: function() { | ||
93 | |||
94 | }, | ||
95 | set: function(value) { | ||
96 | |||
97 | } | ||
98 | }, | ||
99 | |||
100 | branchControllers: { | ||
101 | value: [] | ||
102 | }, | ||
103 | |||
104 | addBranchController : { | ||
105 | value: function(controller) { | ||
106 | if(this.delegate) { | ||
107 | controller.delegate = this.delegate; | ||
108 | } | ||
109 | |||
110 | this.branchControllers.push(controller); | ||
111 | } | ||
112 | }, | ||
113 | |||
114 | /** | ||
115 | @private | ||
116 | */ | ||
117 | _content: { | ||
118 | enumerable: false, | ||
119 | value: null | ||
120 | }, | ||
121 | /** | ||
122 | The content managed by the TreeController. | ||
123 | @type {Function} | ||
124 | @default {String} null | ||
125 | */ | ||
126 | content: { | ||
127 | get: function() { | ||
128 | return this._content; | ||
129 | }, | ||
130 | set: function(value) { | ||
131 | if (this._content === value) { | ||
132 | return; | ||
133 | } | ||
134 | |||
135 | this._content = value; | ||
136 | |||
137 | this.selectedObjects = null; | ||
138 | |||
139 | if (this.rootKey) { | ||
140 | if (value[this.rootKey]) { | ||
141 | this.root = value[this.rootKey]; | ||
142 | } else { | ||
143 | console.log('No root key found in content data'); | ||
144 | } | ||
145 | } else { | ||
146 | this.root = value; | ||
147 | } | ||
148 | |||
149 | } | ||
150 | }, | ||
151 | |||
152 | addObjects : { | ||
153 | value: function() { | ||
154 | |||
155 | var objects = Array.prototype.slice.call(arguments), | ||
156 | i, | ||
157 | objectCount = objects.length, | ||
158 | selectedContentIndexes, firstIndex; | ||
159 | |||
160 | for (i = 0; i < objectCount; i++) { | ||
161 | this.content.push(objects[i]); | ||
162 | } | ||
163 | |||
164 | if (this.selectObjectsOnAddition) { | ||
165 | selectedContentIndexes = []; | ||
166 | firstIndex = this.content.length-objectCount; | ||
167 | for (i = 0; i < objectCount; i++) { | ||
168 | selectedContentIndexes[i] = firstIndex++; | ||
169 | } | ||
170 | this.selectedContentIndexes = selectedContentIndexes; | ||
171 | this.selectedObjects = objects; | ||
172 | } | ||
173 | |||
174 | if (this.clearFilterFunctionOnAddition) { | ||
175 | this.filterFunction = null; | ||
176 | } | ||
177 | |||
178 | if (this.automaticallyOrganizeObjects) { | ||
179 | this.organizeObjects(); | ||
180 | } | ||
181 | |||
182 | } | ||
183 | } | ||
184 | |||
185 | }); | ||
diff --git a/js/document/templates/banner/package.json b/js/document/templates/banner/package.json index c8bc02fb..d1e839dc 100755 --- a/js/document/templates/banner/package.json +++ b/js/document/templates/banner/package.json | |||
@@ -3,6 +3,7 @@ | |||
3 | "lib": "" | 3 | "lib": "" |
4 | }, |