From f3956ef2d738f0c0eb68d5c48a3b47b44291f689 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sat, 13 Nov 2010 15:46:03 -0500 Subject: [PATCH] Display the actor panel without using the zippy. --- web_frontend/actor.js | 18 +++++------------- web_frontend/file.js | 8 +++----- web_frontend/screen.css | 4 +--- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/web_frontend/actor.js b/web_frontend/actor.js index 410e0ba..23a5874 100644 --- a/web_frontend/actor.js +++ b/web_frontend/actor.js @@ -90,6 +90,11 @@ armadillo.Actor.prototype.disposeInternal = function() { this.file_ = null; }; +armadillo.Actor.prototype.createDom = function() { + this.setElementInternal(this.dom_.createDom('div')); + this.decorate(this.getElement()); +}; + /** * Decorates the given element into a path control. * @param {Element} element @@ -219,19 +224,6 @@ armadillo.Actor.prototype.createActionDialog_ = function() { return confirm; }; -/** - * Event handler for when this.popup_ closes. - * @param {Event} e - */ -armadillo.Actor.prototype.onPopupClosed_ = function(e) { - // If an action is not being performed, then dispose the Actor. Otherwise, - // this will get cleaned up after the actionObject_ closes. - if (!this.actionObject_) { - this.file_.setHighlight(armadillo.File.Highlight.SELECTED); - this.dispose(); - } -}; - /** * Tile Control Renderer * @constructor diff --git a/web_frontend/file.js b/web_frontend/file.js index 86d2dd6..9f23ffc 100644 --- a/web_frontend/file.js +++ b/web_frontend/file.js @@ -178,14 +178,12 @@ armadillo.File.prototype.clickHandler_ = function(e) { */ armadillo.File.prototype.actorHandler_ = function(e) { e.stopPropagation(); - if (!this.actor_.isInDocument()) { + if (!this.actor_.isInDocument()) this.actor_.render(this.element_); - this.actor_.setVisible(true); - } - if (!this.zippy_) + if (false && !this.zippy_) this.zippy_ = new goog.ui.AnimatedZippy(this.element_, this.actor_.getElement(), false); - this.zippy_.toggle(); + // this.zippy_.toggle(); }; /** diff --git a/web_frontend/screen.css b/web_frontend/screen.css index 7f40b80..0411ca5 100644 --- a/web_frontend/screen.css +++ b/web_frontend/screen.css @@ -34,7 +34,7 @@ h1 { #ls li { padding: .3em; - height: 1.5em; + min-height: 1.5em; line-height: 1.5em; } @@ -71,8 +71,6 @@ h1 { .actor { width: 8.5em; height: 8.5em; - position: absolute; - visibility: hidden; background-color: rgb(77, 79, 83); -- 2.22.5