diff options
| author | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-31 17:16:21 -0700 |
| commit | 8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch) | |
| tree | 19a8af74c58c9ea261f0842f36efdab959be3256 /js/panels | |
| parent | eea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff) | |
| parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
| download | ninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz | |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/panels')
53 files changed, 4061 insertions, 301 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js index 2a3fc068..b4a803b2 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js | |||
| @@ -4,8 +4,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | var cssPropertyNameList = require("js/panels/CSSPanel/css-property-name-list").cssPropertyNameList, | 7 | var cssPropertyNameList = require("js/panels/CSSPanel/css-property-name-list").CssPropertyNameList, |
| 8 | cssCompletionMap = require("js/panels/CSSPanel/css-value-completion-map").cssValueCompletionMap, | 8 | cssCompletionMap = require("js/panels/CSSPanel/css-value-completion-map").CssValueCompletionMap, |
| 9 | CSS_SHORTHAND_MAP = require("js/panels/CSSPanel/css-shorthand-map").CSS_SHORTHAND_MAP, | 9 | CSS_SHORTHAND_MAP = require("js/panels/CSSPanel/css-shorthand-map").CSS_SHORTHAND_MAP, |
| 10 | keyboardModule = require("js/mediators/keyboard-mediator").Keyboard, | 10 | keyboardModule = require("js/mediators/keyboard-mediator").Keyboard, |
| 11 | nj = require("js/lib/NJUtils").NJUtils; | 11 | nj = require("js/lib/NJUtils").NJUtils; |
| @@ -87,7 +87,7 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre | |||
| 87 | 87 | ||
| 88 | populateStyleSheetList: { | 88 | populateStyleSheetList: { |
| 89 | value: function() { | 89 | value: function() { |
| 90 | this.sections.sheets.doc = this.application.ninja.currentDocument._document; | 90 | this.sections.sheets.doc = this.application.ninja.currentDocument.model.views.design.document; |
| 91 | var styleTagCount = 0, | 91 | var styleTagCount = 0, |
| 92 | sect = this.sections.sheets, | 92 | sect = this.sections.sheets, |
| 93 | sheetsArray = nj.toArray(sect.doc.styleSheets), | 93 | sheetsArray = nj.toArray(sect.doc.styleSheets), |
| @@ -822,17 +822,14 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre | |||
| 822 | }, | 822 | }, |
| 823 | getAllRelatedRules : { | 823 | getAllRelatedRules : { |
| 824 | value: function(element) { | 824 | value: function(element) { |
| 825 | var pseudos = [null],//, 'link', 'visited', 'active', 'hover', 'focus', 'first-letter', | 825 | var rules = [], |
| 826 | //'first-line', 'first-child', 'before', 'after', 'lang'], | 826 | win = element.ownerDocument.defaultView, |
| 827 | rules = [], | ||
| 828 | self = this; | 827 | self = this; |
| 829 | 828 | ||
| 830 | pseudos.forEach(function(pseudo) { | 829 | rules = rules.concat(nj.toArray(win.getMatchedCSSRules(element)).filter(function(rule) { |
| 831 | rules = rules.concat(nj.toArray(this.getMatchedCSSRules(element, ':'+pseudo)).filter(function(rule) { | 830 | var sheetId = (rule.parentStyleSheet) ? rule.parentStyleSheet.ownerNode.id : null; |
| 832 | var sheetId = (rule.parentStyleSheet) ? rule.parentStyleSheet.ownerNode.id : null; | 831 | return sheetId !== self._stageStyleSheetId; |
| 833 | return sheetId !== self._stageStyleSheetId; | 832 | })); |
| 834 | })); | ||
| 835 | }, element.ownerDocument.defaultView); | ||
| 836 | 833 | ||
| 837 | return rules; | 834 | return rules; |
| 838 | } | 835 | } |
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html index 25196bc6..cf5bbbdd 100755 --- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html +++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | |||
| @@ -25,11 +25,11 @@ | |||
| 25 | </script> | 25 | </script> |
| 26 | 26 | ||
| 27 | </head> | 27 | </head> |
| 28 | <body id="computestylesubpanel" onload=""> | 28 | <body> |
| 29 | <div data-montage-id="nj-css-panel-computed" class="nj-css-panel-hide"> | 29 | <div data-montage-id="nj-css-panel-computed" class="nj-css-panel-computed"> |
| 30 | <div id="nj-css-filter-panel"> | 30 | <div data-montage-id="nj-css-filter-panel" class="nj-css-filter-panel"> |
| 31 | <input data-montage-id="nj-css-filter" class="nj-skinned" type="search"> | 31 | <input data-montage-id="nj-css-filter" class="nj-skinned nj-css-filter-input" type="search"> |
| 32 | <select data-montage-id="nj-css-group-select" class="nj-skinned"> | 32 | <select data-montage-id="nj-css-group-select" class="nj-skinned nj-css-group-select"> |
| 33 | <option value="all">All</option> | 33 | <option value="all">All</option> |
| 34 | <option value="summary" selected>Summary</option> | 34 | <option value="summary" selected>Summary</option> |
| 35 | <option value="background">Background</option> | 35 | <option value="background">Background</option> |
| @@ -40,7 +40,7 @@ | |||
| 40 | </select> | 40 | </select> |
| 41 | </div> | 41 | </div> |
| 42 | <div class="nj-sub-panel"> | 42 | <div class="nj-sub-panel"> |
| 43 | <dl data-montage-id="nj-css-computed-list" class="nj-css-style-list"></dl> | 43 | <dl data-montage-id="nj-css-computed-list" class="nj-css-style-list nj-css-computed-list"></dl> |
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |
| 46 | </body> | 46 | </body> |
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css index e9af9b88..d60f2d9c 100755 --- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css +++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/computed-style-sub-panel.css | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | #nj-css-filter-panel { | 7 | .nj-css-filter-panel { |
| 8 | background-color: #474747; | 8 | background-color: #474747; |
| 9 | box-shadow: 0 1px 1px #505050; | 9 | box-shadow: 0 1px 1px #505050; |
| 10 | border-bottom: 1px solid rgba(0, 0, 0, 0.1); | 10 | border-bottom: 1px solid rgba(0, 0, 0, 0.1); |
| @@ -12,51 +12,51 @@ | |||
| 12 | padding: 8px 0; | 12 | padding: 8px 0; |
| 13 | position: relative; | 13 | position: relative; |
| 14 | } | 14 | } |
| 15 | #nj-computed-sub-panel { | 15 | .nj-css-panel-computed { |
| 16 | display:-webkit-box; | 16 | display:-webkit-box; |
| 17 | -webkit-box-flex: 1; | 17 | -webkit-box-flex: 1; |
| 18 | -webkit-box-orient: vertical; | 18 | -webkit-box-orient: vertical; |
| 19 | } | 19 | } |
| 20 | #nj-computed-sub-panel .nj-sub-panel { | 20 | /*#nj-com |