aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorEric Guzman2012-06-20 21:56:33 -0700
committerEric Guzman2012-06-20 21:56:33 -0700
commite2891e2c44ac6c58fe3158e2caddb62eb1067213 (patch)
tree6559778602525f633bae861d70f8d9c8ee5d9cec /js
parent3270aac4980c908f305fb53abadda5121ff6b9cb (diff)
parent18768295f0612b304ddc386752adcbf89be65ced (diff)
downloadninja-e2891e2c44ac6c58fe3158e2caddb62eb1067213.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js')
-rw-r--r--js/panels/binding/binding-item.reel/binding-item.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/binding/binding-item.reel/binding-item.html b/js/panels/binding/binding-item.reel/binding-item.html
index 95a349f8..26901f85 100644
--- a/js/panels/binding/binding-item.reel/binding-item.html
+++ b/js/panels/binding/binding-item.reel/binding-item.html
@@ -55,7 +55,7 @@
55 } 55 }
56 }, 56 },
57 "editButton": { 57 "editButton": {
58 "prototype": "montage/ui/button.reel", 58 "prototype": "montage/ui/native/button.reel",
59 "properties": { 59 "properties": {
60 "element": {"#": "edit-button"}, 60 "element": {"#": "edit-button"},
61 "identifier": "editButton", 61 "identifier": "editButton",
@@ -68,7 +68,7 @@
68 68
69 }, 69 },
70 "directionToggleButton": { 70 "directionToggleButton": {
71 "prototype": "montage/ui/button.reel", 71 "prototype": "montage/ui/native/button.reel",
72 "properties": { 72 "properties": {
73 "element": {"#": "direction-toggle-button"}, 73 "element": {"#": "direction-toggle-button"},
74 "identifier": "directionToggleButton", 74 "identifier": "directionToggleButton",