diff options
-rw-r--r-- | js/controllers/objects-controller.js | 6 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 2 | ||||
-rwxr-xr-x | js/panels/properties.reel/properties.css | 8 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 2 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js | 30 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.css | 38 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.html | 3 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | 105 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.html | 8 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.js | 38 | ||||
-rw-r--r-- | js/tools/bindingTool.js | 20 |
11 files changed, 170 insertions, 90 deletions
diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js index 6557c14e..6ca869ba 100644 --- a/js/controllers/objects-controller.js +++ b/js/controllers/objects-controller.js | |||
@@ -27,7 +27,7 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, { | |||
27 | setTimeout(function() { | 27 | setTimeout(function() { |
28 | this.bindToModelObjects(); | 28 | this.bindToModelObjects(); |
29 | }.bind(this), 1000); | 29 | }.bind(this), 1000); |
30 | 30 | this.currentObjectBindings = []; | |
31 | this._currentDocument = doc; | 31 | this._currentDocument = doc; |
32 | }, | 32 | }, |
33 | enumerable : false | 33 | enumerable : false |
@@ -150,9 +150,9 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, { | |||
150 | var properties = []; | 150 | var properties = []; |
151 | 151 | ||
152 | for(var key in object) { | 152 | for(var key in object) { |
153 | if(object.hasOwnProperty(key)) { | 153 | //if(object.hasOwnProperty(key)) { |
154 | properties.push(key); | 154 | properties.push(key); |
155 | } | 155 | //} |
156 | } | 156 | } |
157 | 157 | ||
158 | if(excludeUnderscoreProperties) { | 158 | if(excludeUnderscoreProperties) { |
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index e325316b..94f69ed8 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -516,8 +516,10 @@ exports.Ninja = Montage.create(Component, { | |||
516 | 516 | ||
517 | if(this.appModel.livePreview) { | 517 | if(this.appModel.livePreview) { |
518 | transitionStopRule = "nj-css-garbage-selector"; | 518 | transitionStopRule = "nj-css-garbage-selector"; |
519 | this.stage.bindingView.hide = true; | ||
519 | } else { | 520 | } else { |
520 | transitionStopRule = "*" | 521 | transitionStopRule = "*" |
522 | this.stage.bindingView.hide = false; | ||
521 | } | 523 | } |
522 | 524 | ||
523 | this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule; | 525 | this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule; |
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index d1aa750a..786eb57a 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css | |||
@@ -314,11 +314,11 @@ input label { | |||
314 | width:45px; | 314 | width:45px; |
315 | } | 315 | } |
316 | 316 | ||
317 | .propertiesPanel div.montage-button:disabled { | 317 | .propertiesPanel div[type=button]:disabled { |
318 | opacity: 0.4; | 318 | opacity: 0.4; |
319 | } | 319 | } |
320 | 320 | ||
321 | .propertiesPanel div.montage-button { | 321 | .propertiesPanel div[type=button] { |
322 | font-size: 9px; | 322 | font-size: 9px; |
323 | cursor: pointer; | 323 | cursor: pointer; |
324 | display: block; | 324 | display: block; |
@@ -336,10 +336,10 @@ input label { | |||
336 | height: 14px; | 336 | height: 14px; |
337 | } | 337 | } |
338 | 338 | ||
339 | .propertiesPanel div.montage-button:active { | 339 | .propertiesPanel div[type=button]:active { |
340 | background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); | 340 | background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); |
341 | } | 341 | } |
342 | 342 | ||
343 | .propertiesPanel div.montage-button:hover { | 343 | .propertiesPanel div[type=button]:hover { |
344 | -webkit-box-shadow: 0px 0px 3px #b4b4b4; | 344 | -webkit-box-shadow: 0px 0px 3px #b4b4b4; |
345 | } \ No newline at end of file | 345 | } \ No newline at end of file |
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 5112fca9..ed4616da 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
@@ -20,7 +20,7 @@ var Dropdown = require("js/components/combobox.reel").Combobox; | |||
20 | var TextField = require("js/components/textfield.reel").TextField; | 20 | var TextField = require("js/components/textfield.reel").TextField; |
21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; | 21 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; |
22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; | 22 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; |
23 | var Button = require("montage/ui/button.reel").Button; | 23 | var Button = require("montage/ui/native/button.reel").Button; |
24 | 24 | ||
25 | exports.CustomSection = Montage.create(Component, { | 25 | exports.CustomSection = Montage.create(Component, { |
26 | 26 | ||
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js index fb0fd57e..a7fbb297 100755 --- a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js +++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js | |||
@@ -26,8 +26,28 @@ exports.BindingHudOption = Montage.create(Component, { | |||
26 | } | 26 | } |
27 | }, | 27 | }, |
28 | 28 | ||
29 | bound: { | 29 | _promoted : { value: null }, |
30 | value: false | 30 | promoted : { |
31 | get : function() { return this._promoted; }, | ||
32 | set : function(value) { | ||
33 | if(value === this._promoted) { return; } | ||
34 | |||
35 | this._promoted = value; | ||
36 | |||
37 | this.needsDraw = true; | ||
38 | } | ||
39 | }, | ||
40 | |||
41 | _bound : { value: null }, | ||
42 | bound : { | ||
43 | get : function() { return this._bound; }, | ||
44 | set : function(value) { | ||
45 | if(value === this._bound) { return; } | ||
46 | |||
47 | this._bound = value; | ||
48 | |||
49 | this.needsDraw = true; | ||
50 | } | ||
31 | }, | 51 | }, |
32 | 52 | ||
33 | prepareForDraw: { | 53 | prepareForDraw: { |
@@ -47,6 +67,12 @@ exports.BindingHudOption = Montage.create(Component, { | |||
47 | } else { | 67 | } else { |
48 | this.element.classList.remove("bound"); | 68 | this.element.classList.remove("bound"); |
49 | } | 69 | } |
70 | |||
71 | if(this.promoted || this.bound) { | ||
72 | this.element.classList.add("promoted"); | ||
73 | } else { | ||
74 | this.element.classList.remove("promoted"); | ||
75 | } | ||
50 | // if(this.bindings.length > 0) { | 76 | // if(this.bindings.length > 0) { |
51 | // this.element.classList.add("bound"); | 77 | // this.element.classList.add("bound"); |
52 | // } else { | 78 | // } else { |
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css index 680f9183..1536c706 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css | |||
@@ -6,14 +6,12 @@ | |||
6 | 6 | ||
7 | .bindingHud { | 7 | .bindingHud { |
8 | position: absolute; | 8 | position: absolute; |
9 | background: rgba(0, 0, 0, 0.85); | 9 | background: rgba(24, 24, 24, 0.85); |
10 | /*padding: 0px;*/ | ||
11 | color: #C4C4C4; | 10 | color: #C4C4C4; |
12 | font-size: 11px; | 11 | font-size: 11px; |
13 | box-shadow: inset 0px 0px 0px 0px #CCC; | 12 | box-shadow: 3px 3px 20px rgba(0, 0, 0, 0.61); |
14 | border-radius: 6px; | 13 | border-radius: 6px; |
15 | padding: 3px 1px 1px; | 14 | padding: 3px; |
16 | border:1px solid #000; | ||
17 | text-shadow: 1px 1px 0px #000; | 15 | text-shadow: 1px 1px 0px #000; |
18 | } | 16 | } |
19 | 17 | ||
@@ -31,6 +29,8 @@ | |||
31 | /*background: rgba(0, 0, 0, 0.3);*/ | 29 | /*background: rgba(0, 0, 0, 0.3);*/ |
32 | line-height:16px; | 30 | line-height:16px; |
33 | /*box-shadow: inset 0px 0px 4px #333, 1px 1px 0px #3A3A3A;*/ | 31 | /*box-shadow: inset 0px 0px 4px #333, 1px 1px 0px #3A3A3A;*/ |
32 | padding-top: 4px; | ||
33 | margin: 0 5px; | ||
34 | min-width: 80px; | 34 | min-width: 80px; |
35 | } | 35 | } |
36 | 36 | ||
@@ -40,7 +40,10 @@ | |||
40 | line-height:16px; | 40 | line-height:16px; |
41 | padding:1px 25px 1px 8px; | 41 | padding:1px 25px 1px 8px; |
42 | } | 42 | } |
43 | 43 | .bindingHud .hudOption.promoted { | |
44 | color: #FFF; | ||
45 | font-weight: bold; | ||
46 | } | ||
44 | .bindingHud .hudOption .connectorBubble:hover { | 47 | .bindingHud .hudOption .connectorBubble:hover { |
45 | background-color: #1B52A7; | 48 | background-color: #1B52A7; |
46 | box-shadow: inset 0px 2px 2px 1px rgba(15, 15, 15, 0.78), 0 1px #474747; | 49 | box-shadow: inset 0px 2px 2px 1px rgba(15, 15, 15, 0.78), 0 1px #474747; |
@@ -58,35 +61,35 @@ | |||
58 | 61 | ||
59 | .bindingHud .hudOption .connectorBubble { | 62 | .bindingHud .hudOption .connectorBubble { |
60 | position: absolute; | 63 | position: absolute; |
61 | right: 5px; | 64 | right: 2px; |
62 | top: 3px; |