From bb1ab90e9ad1814f4e26f820bcdf5e54fa838a18 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 12 Jun 2012 12:59:42 -0700 Subject: Binding Panel - set up new edit view layout --- .../edit-binding-view.reel/edit-binding-view.css | 13 +++++++++ .../edit-binding-view.reel/edit-binding-view.html | 31 ++++++++++++---------- 2 files changed, 30 insertions(+), 14 deletions(-) (limited to 'js/panels/binding') 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 aa539cd6..37e27309 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 @@ -19,6 +19,19 @@ -webkit-user-select: text; } +.edit-object-binding { + display: -webkit-box; + -webkit-box-orient: horizontal +} +.edit-object-binding > div { + -webkit-box-flex: 1; + overflow: hidden; +} +.edit-object-binding .object-icon { + -webkit-transform: scale(.75); + float: left; +} + .edit-binding-view ul { padding: 0; margin: 0; diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html index 604d4871..c13e4587 100644 --- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html @@ -148,23 +148,26 @@
-
\ 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 c9f946f5..10f427af 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 @@ -145,7 +145,6 @@ exports.EditBindingView = Montage.create(Component, { controller.editBinding(this.bindingArgs, newBindingArgs); } - controller.currentObject = controller.currentObject; } }, @@ -174,7 +173,6 @@ exports.EditBindingView = Montage.create(Component, { var controller = this.application.ninja.objectsController; controller.removeBinding(this.bindingArgs); - controller.currentObject = controller.currentObject; this.parentComponent.editing = false; } -- cgit v1.2.3