aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/panels/binding/edit-binding-view.reel/edit-binding-view.css4
-rw-r--r--js/panels/binding/edit-binding-view.reel/edit-binding-view.js11
-rw-r--r--js/stage/objects-tray.reel/objects-tray.js9
3 files changed, 23 insertions, 1 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 },
diff --git a/js/stage/objects-tray.reel/objects-tray.js b/js/stage/objects-tray.reel/objects-tray.js
index c046a3bb..190abf57 100644
--- a/js/stage/objects-tray.reel/objects-tray.js
+++ b/js/stage/objects-tray.reel/objects-tray.js
@@ -13,6 +13,7 @@ var Montage = require("montage/core/core").Montage,
13 13
14exports.ObjectsTray = Montage.create(Component, { 14exports.ObjectsTray = Montage.create(Component, {
15 hideClass : { value: 'hide-objects-tray'}, 15 hideClass : { value: 'hide-objects-tray'},
16 _empty : { value: null },
16 _workspaceMode : { value: null }, 17 _workspaceMode : { value: null },
17 workspaceMode : { 18 workspaceMode : {
18 get : function() { return this._workspaceMode; }, 19 get : function() { return this._workspaceMode; },
@@ -76,11 +77,17 @@ exports.ObjectsTray = Montage.create(Component, {
76 "oneway": true 77 "oneway": true
77 }); 78 });
78 79
80 if(this.objects) {
81 this.empty = !this.objects.length;
82 } else {
83 this.empty = true;
84 }
85
79 } 86 }
80 }, 87 },
81 draw : { 88 draw : {
82 value: function() { 89 value: function() {
83 if(this.hide) { 90 if(this.hide || this._empty) {
84 this.element.classList.add(this.hideClass); 91 this.element.classList.add(this.hideClass);
85 } else { 92 } else {
86 this.element.classList.remove(this.hideClass); 93 this.element.classList.remove(this.hideClass);