diff options
author | Eric Guzman | 2012-05-01 12:06:15 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-01 12:06:15 -0700 |
commit | 084576ca2dcaaff1184338e0ec4a587ee0dacee7 (patch) | |
tree | 83391e752a5e75723b61c08c9e970a108fee6818 /js | |
parent | 514aee0052f6721758401023accd9a4a56cdd217 (diff) | |
download | ninja-084576ca2dcaaff1184338e0ec4a587ee0dacee7.tar.gz |
CSS Panel - Added code hinting and tooltips
Diffstat (limited to 'js')
-rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js | 4 | ||||
-rwxr-xr-x | js/panels/CSSPanel/css-property-name-list.js | 2 | ||||
-rw-r--r-- | js/panels/css-panel/style.reel/style.css | 3 | ||||
-rw-r--r-- | js/panels/css-panel/style.reel/style.html | 6 | ||||
-rw-r--r-- | js/panels/css-panel/style.reel/style.js | 11 |
5 files changed, 22 insertions, 4 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js index 2a3fc068..ad8387de 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; |
diff --git a/js/panels/CSSPanel/css-property-name-list.js b/js/panels/CSSPanel/css-property-name-list.js index 24a69c09..6d02b755 100755 --- a/js/panels/CSSPanel/css-property-name-list.js +++ b/js/panels/CSSPanel/css-property-name-list.js | |||
@@ -4,7 +4,7 @@ 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 | exports.cssPropertyNameList = [ | 7 | exports.CssPropertyNameList = [ |
8 | '-webkit-', | 8 | '-webkit-', |
9 | "-webkit-animation", | 9 | "-webkit-animation", |
10 | "-webkit-animation-delay", | 10 | "-webkit-animation-delay", |
diff --git a/js/panels/css-panel/style.reel/style.css b/js/panels/css-panel/style.reel/style.css index ff410951..c6bb070c 100644 --- a/js/panels/css-panel/style.reel/style.css +++ b/js/panels/css-panel/style.reel/style.css | |||
@@ -110,6 +110,9 @@ | |||
110 | margin-right: -7px; | 110 | margin-right: -7px; |
111 | right: -1px; | 111 | right: -1px; |
112 | } | 112 | } |
113 | .style-item .hintable-hint { | ||
114 | color: #CCC; | ||
115 | } | ||
113 | 116 | ||
114 | /* ------------------------ | 117 | /* ------------------------ |
115 | Empty Style (Add Style) | 118 | Empty Style (Add Style) |
diff --git a/js/panels/css-panel/style.reel/style.html b/js/panels/css-panel/style.reel/style.html index 469c7268..acc169be 100644 --- a/js/panels/css-panel/style.reel/style.html +++ b/js/panels/css-panel/style.reel/style.html | |||
@@ -17,9 +17,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
17 | "element" : {"#" : "container"}, | 17 | "element" : {"#" : "container"}, |
18 | "addStyleButton": {"#": "add-style-button"}, | 18 | "addStyleButton": {"#": "add-style-button"}, |
19 | "propertyField": {"@": "property"}, | 19 | "propertyField": {"@": "property"}, |
20 | "valueField": {"@": "value"} | 20 | "valueField": {"@": "value"}, |
21 | "propertyNames" : {"@": "propertyNames"} | ||
21 | } | 22 | } |
22 | }, | 23 | }, |
24 | "propertyNames": { | ||
25 | "object": "js/panels/CSSPanel/css-property-name-list" | ||
26 | }, | ||
23 | "checkbox": { | 27 | "checkbox": { |
24 | "module": "montage/ui/checkbox.reel", | 28 | "module": "montage/ui/checkbox.reel", |
25 | "name": "Checkbox", | 29 | "name": "Checkbox", |
diff --git a/js/panels/css-panel/style.reel/style.js b/js/panels/css-panel/style.reel/style.js index a8939bc6..b079bc73 100644 --- a/js/panels/css-panel/style.reel/style.js +++ b/js/panels/css-panel/style.reel/style.js | |||
@@ -272,6 +272,8 @@ exports.Style = Montage.create(TreeNode, { | |||
272 | templateDidLoad : { | 272 | templateDidLoad : { |
273 | value: function() { | 273 | value: function() { |
274 | this.delegate = this.treeView.contentController.delegate; | 274 | this.delegate = this.treeView.contentController.delegate; |
275 | |||
276 | this.propertyField.hints = this.propertyNames; | ||
275 | } | 277 | } |
276 | }, | 278 | }, |
277 | 279 | ||
@@ -312,6 +314,13 @@ exports.Style = Montage.create(TreeNode, { | |||
312 | } | 314 | } |
313 | }, | 315 | }, |
314 | 316 | ||
317 | setToolTips : { | ||
318 | value: function() { | ||
319 | this.propertyField.element.title = this.propertyField.value; | ||
320 | this.valueField.element.title = this.valueField.value; | ||
321 | } | ||
322 | }, | ||
323 | |||
315 | willDraw : { | 324 | willDraw : { |
316 | value: function() { | 325 | value: function() { |
317 | if(this.invalid) { | 326 | if(this.invalid) { |
@@ -319,6 +328,8 @@ exports.Style = Montage.create(TreeNode, { | |||
319 | } else { | 328 | } else { |
320 | this._element.removeAttribute('title'); | 329 | this._element.removeAttribute('title'); |
321 | } | 330 | } |
331 | |||
332 | this.setToolTips(); | ||
322 | } | 333 | } |
323 | }, | 334 | }, |
324 | 335 | ||