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/style-declaration.reel/style-declaration.html | |
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/style-declaration.reel/style-declaration.html')
-rw-r--r-- | js/panels/css-panel/style-declaration.reel/style-declaration.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.html b/js/panels/css-panel/style-declaration.reel/style-declaration.html index fad54453..4cdf0741 100644 --- a/js/panels/css-panel/style-declaration.reel/style-declaration.html +++ b/js/panels/css-panel/style-declaration.reel/style-declaration.html | |||
@@ -43,9 +43,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
43 | }, | 43 | }, |
44 | "bindings": { | 44 | "bindings": { |
45 | "source": {"<-": "@repetition.objectAtCurrentIteration" }, | 45 | "source": {"<-": "@repetition.objectAtCurrentIteration" }, |
46 | "propertyText": {"<<->": "@repetition.objectAtCurrentIteration.name" }, | 46 | "propertyText": {"<->": "@repetition.objectAtCurrentIteration.name" }, |
47 | "valueText": {"<<->": "@repetition.objectAtCurrentIteration.value" }, | 47 | "valueText": {"<->": "@repetition.objectAtCurrentIteration.value" }, |
48 | "empty": {"<<->": "@repetition.objectAtCurrentIteration.isEmpty" }, | 48 | "empty": {"<->": "@repetition.objectAtCurrentIteration.isEmpty" }, |
49 | "delegate": {"<-": "@owner.focusDelegate" } | 49 | "delegate": {"<-": "@owner.focusDelegate" } |
50 | } | 50 | } |
51 | } | 51 | } |