diff options
Diffstat (limited to 'js')
40 files changed, 2139 insertions, 11 deletions
diff --git a/js/components/toolbar.reel/toolbar.css b/js/components/toolbar.reel/toolbar.css new file mode 100644 index 00000000..1ffae912 --- /dev/null +++ b/js/components/toolbar.reel/toolbar.css | |||
@@ -0,0 +1,14 @@ | |||
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 | .toolbar-container { | ||
7 | background-color: #474747; | ||
8 | border-bottom: 1px solid #333; | ||
9 | border-top: 1px solid #505050; | ||
10 | box-shadow: 0 4px 8px 0px rgba(0,0,0,0.75); | ||
11 | height: 22px; | ||
12 | width: 100%; | ||
13 | -webkit-box-flex: 0; | ||
14 | } \ No newline at end of file | ||
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html new file mode 100644 index 00000000..69eba194 --- /dev/null +++ b/js/components/toolbar.reel/toolbar.html | |||
@@ -0,0 +1,34 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html lang="en"> | ||
8 | <head> | ||
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
10 | <link href="toolbar.css" rel="stylesheet" type="text/css"> | ||
11 | <script type="text/montage-serialization"> | ||
12 | { | ||
13 | "owner": { | ||
14 | "module" : "js/panels/css-panel/style-sheet.reel", | ||
15 | "name" : "StyleSheet", | ||
16 | "properties" : { | ||
17 | "element" : {"#" : "toolbar-container"} | ||
18 | } | ||
19 | }, | ||
20 | "button": { | ||
21 | "module": "montage/ui/button.reel", | ||
22 | "name": "Button", | ||
23 | "properties": { | ||
24 | |||
25 | } | ||
26 | } | ||
27 | } | ||
28 | </script> | ||
29 | </head> | ||
30 | <body> | ||
31 | <div id="toolbar-container" class="toolbar-container"> | ||
32 | </div> | ||
33 | </body> | ||
34 | </html> \ No newline at end of file | ||
diff --git a/js/components/toolbar.reel/toolbar.js b/js/components/toolbar.reel/toolbar.js new file mode 100644 index 00000000..79e7ff1f --- /dev/null +++ b/js/components/toolbar.reel/toolbar.js | |||
@@ -0,0 +1,27 @@ | |||
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 | var Montage = require("montage/core/core").Montage, | ||
8 | Component = require("montage/ui/component").Component; | ||
9 | |||
10 | exports.Toolbar = Montage.create(Component, { | ||
11 | |||
12 | deserializedFromTemplate : { | ||
13 | value: function() { | ||
14 | console.log("toolbar - deserialized"); | ||
15 | } | ||
16 | }, | ||
17 | prepareForDraw : { | ||
18 | value: function() { | ||
19 | console.log("toolbar - prepare for draw"); | ||
20 | } | ||
21 | }, | ||
22 | draw : { | ||
23 | value: function() { | ||
24 | console.log("toolbar - draw"); | ||
25 | } | ||
26 | } | ||
27 | }); \ No newline at end of file | ||
diff --git a/js/components/treeview/tree-node.js b/js/components/treeview/tree-node.js index d7b864b5..fa6e1ba4 100644 --- a/js/components/treeview/tree-node.js +++ b/js/components/treeview/tree-node.js | |||
@@ -52,6 +52,10 @@ exports.TreeNode = Montage.create(Component, { | |||
52 | }, this); | 52 | }, this); |
53 | } | 53 | } |
54 | this._sourceObject = object; | 54 | this._sourceObject = object; |
55 | |||
56 | if(this.handleSourceObjectSet) { | ||
57 | this.handleSourceObjectSet(); | ||
58 | } | ||
55 | } | 59 | } |
56 | }, | 60 | }, |
57 | childNodes : { | 61 | childNodes : { |
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index addfc24e..d36c8cb9 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
@@ -94,11 +94,18 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
94 | // Returns null if sheet not found (as in non-ninja projects) | 94 | // Returns null if sheet not found (as in non-ninja projects) |
95 | // Setter will handle null case | 95 | // Setter will handle null case |
96 | this.defaultStylesheet = this.getSheetFromElement(this.CONST.DEFAULT_SHEET_ID); | 96 | this.defaultStylesheet = this.getSheetFromElement(this.CONST.DEFAULT_SHEET_ID); |
97 | 97 | ||
98 | //debugger; | 98 | this.userStyleSheets = nj.toArray(document._document.styleSheets).filter(function(sheet) { |
99 | return sheet !== this._stageStylesheet; | ||
100 | }, this); | ||
101 | |||
102 | NJevent('styleSheetsReady', this); | ||
99 | }, | 103 | }, |
100 | enumerable : false | 104 | enumerable : false |
101 | }, | 105 | }, |
106 | userStyleSheets : { | ||
107 | value : null | ||
108 | }, | ||
102 | _stageStylesheet : { | 109 | _stageStylesheet : { |
103 | value : null | 110 | value : null |
104 | }, | 111 | }, |
@@ -183,6 +190,7 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
183 | ///// attach specificity to rule object | 190 | ///// attach specificity to rule object |
184 | ///// if rule is css keyframes, return rule and don't attach specificity | 191 | ///// if rule is css keyframes, return rule and don't attach specificity |
185 | if (rule instanceof WebKitCSSKeyframesRule) { | 192 | if (rule instanceof WebKitCSSKeyframesRule) { |
193 | |||
186 | return rule; | 194 | return rule; |
187 | } | 195 | } |
188 | rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText); | 196 | rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText); |
@@ -1177,6 +1185,8 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1177 | 1185 | ||
1178 | this.styleSheetModified(sheet); | 1186 | this.styleSheetModified(sheet); |
1179 | 1187 | ||
1188 | NJevent('newStyleSheet', sheet); | ||
1189 | |||
1180 | return sheet; | 1190 | return sheet; |
1181 | } | 1191 | } |
1182 | }, | 1192 | }, |
@@ -1239,11 +1249,10 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1239 | this.dirtyStyleSheets.length = 0; | 1249 | this.dirtyStyleSheets.length = 0; |
1240 | 1250 | ||
1241 | if(doc) { | 1251 | if(doc) { |
1242 | var stillDirty = this.dirtyStyleSheets.filter(function(sheet) { | 1252 | this.dirtyStyleSheets = null; |
1253 | this.dirtyStyleSheets = this.dirtyStyleSheets.filter(function(sheet) { | ||
1243 | return sheet.document !== doc; | 1254 | return sheet.document !== doc; |
1244 | }); | 1255 | }); |
1245 | this.dirtyStyleSheets = null; | ||
1246 |