diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/css-panel/styles-view-delegate.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/panels/css-panel/styles-view-delegate.js')
-rw-r--r-- | js/panels/css-panel/styles-view-delegate.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/css-panel/styles-view-delegate.js b/js/panels/css-panel/styles-view-delegate.js index 87686826..a7c1f0d9 100644 --- a/js/panels/css-panel/styles-view-delegate.js +++ b/js/panels/css-panel/styles-view-delegate.js | |||
@@ -9,6 +9,12 @@ var Montage = require("montage/core/core").Montage, | |||
9 | Keyboard = require("js/mediators/keyboard-mediator").Keyboard; | 9 | Keyboard = require("js/mediators/keyboard-mediator").Keyboard; |
10 | 10 | ||
11 | exports.StylesViewDelegate = Montage.create(Component, { | 11 | exports.StylesViewDelegate = Montage.create(Component, { |
12 | |||
13 | ruleListContainer: { | ||
14 | value: null, | ||
15 | serializable: true | ||
16 | }, | ||
17 | |||
12 | newClassPrefix : { value: "new-class" }, | 18 | newClassPrefix : { value: "new-class" }, |
13 | elementOutlineClass : { value: "nj-element-highlight" }, | 19 | elementOutlineClass : { value: "nj-element-highlight" }, |
14 | 20 | ||