diff options
author | Eric Guzman | 2012-06-18 13:23:05 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-18 13:23:05 -0700 |
commit | b7e739311d9ddeb99029313cae9395878c7f7706 (patch) | |
tree | b68441b2f383c7b5ea7b5a88b092f8613534e395 /js/panels/binding | |
parent | 39ca897a886ae55d19c8cb3f7b4a0a705b60dc60 (diff) | |
download | ninja-b7e739311d9ddeb99029313cae9395878c7f7706.tar.gz |
Binding - Show tray when there are objects. Edit binding view css update.
Diffstat (limited to 'js/panels/binding')
-rw-r--r-- | js/panels/binding/edit-binding-view.reel/edit-binding-view.css | 4 | ||||
-rw-r--r-- | js/panels/binding/edit-binding-view.reel/edit-binding-view.js | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.css b/js/panels/binding/edit-binding-view.reel/edit-binding-view.css index 01feb5cc..955cff3a 100644 --- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.css +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.css | |||
@@ -116,6 +116,10 @@ | |||
116 | width: 80%; | 116 | width: 80%; |
117 | } | 117 | } |
118 | 118 | ||
119 | .hintable-field .hintable-hint { | ||
120 | color: #7C7C7C; | ||
121 | } | ||
122 | |||
119 | .hintable-field:focus { | 123 | .hintable-field:focus { |
120 | border: 1px solid #313131; | 124 | border: 1px solid #313131; |
121 | } \ No newline at end of file | 125 | } \ No newline at end of file |
diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.js b/js/panels/binding/edit-binding-view.reel/edit-binding-view.js index 62a47aaf..8fd6a48e 100644 --- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.js +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.js | |||
@@ -65,6 +65,12 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, { | |||
65 | 65 | ||
66 | this._sourceObject = value; | 66 | this._sourceObject = value; |
67 | 67 | ||
68 | if(value) { | ||
69 | |||
70 | this.sourceObjectPropertyPathField.hints = this.application.ninja.objectsController.getPropertiesFromObject(value); | ||
71 | console.log("Setting hints to: ", this.sourceObjectPropertyPathField.hints); | ||
72 | } | ||
73 | |||
68 | this.needsDraw = true; | 74 | this.needsDraw = true; |
69 | } | 75 | } |
70 | }, | 76 | }, |
@@ -77,6 +83,11 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, { | |||
77 | console.log("Bound Object being set to ", value); | 83 | console.log("Bound Object being set to ", value); |
78 | this._boundObject = value; | 84 | this._boundObject = value; |
79 | 85 | ||
86 | if(value) { | ||
87 | this.boundObjectPropertyPathField.hints = this.application.ninja.objectsController.getPropertiesFromObject(value); | ||
88 | console.log("Setting hints to: ", this.boundObjectPropertyPathField.hints); | ||
89 | } | ||
90 | |||
80 | this.needsDraw = true; | 91 | this.needsDraw = true; |
81 | } | 92 | } |
82 | }, | 93 | }, |