moksha/api moksha/public

[John (J5) Palmieri]

moksha/api/widgets/grid.py                     |    6 +++++-
 moksha/public/javascript/ui/moksha.ui.popup.js |   17 ++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit e4d71f081fe44a9acdb7e0f87a9fa5099163f959
Author: John (J5) Palmieri 
Date:   Tue Apr 14 13:27:17 2009 -0400

make popups work in grids

diff --git a/moksha/api/widgets/grid.py b/moksha/api/widgets/grid.py
index e62b4ed..e89bccd 100644
--- a/moksha/api/widgets/grid.py
+++ b/moksha/api/widgets/grid.py
@@ -16,8 +16,12 @@ moksha_ui_grid_js = JSLink(filename='public/javascript/ui/moksha.ui.grid.js',
                                        jquery_template_js,
                                        jquery_json_js])

+moksha_ui_popup_js = JSLink(filename='public/javascript/ui/moksha.ui.popup.js',
+                           modname='moksha',
+                           javascript=[jquery_ui_core_js])
+
 class Grid(FormField):
-    javascript=[jquery_ui_core_js, moksha_ui_grid_js]
+    javascript=[jquery_ui_core_js, moksha_ui_grid_js, moksha_ui_popup_js]
     params= ['rows_per_page', 'page_num', 'total_rows',
             'filters', 'unique_key', 'sort_key', 'sort_order',
             'row_template', 'resource', 'resource_path',
diff --git a/moksha/public/javascript/ui/moksha.ui.popup.js b/moksha/public/javascript/ui/moksha.ui.popup.js
index b5bce08..8c473e5 100644
--- a/moksha/public/javascript/ui/moksha.ui.popup.js
+++ b/moksha/public/javascript/ui/moksha.ui.popup.js
@@ -1,5 +1,5 @@
 /*
- * Moksha UI Popup - Popup a block on user interactions such as mouse hover and click.  
+ * Moksha UI Popup - Popup a block on user interactions such as mouse hover and click.
  *                   Can be used to create popup menus
  *
  * Copyright (c) 2009 Red Hat, Inc.
@@ -12,7 +12,7 @@
  */
 (function ($) {
 $.widget("ui.moksha_popup", {
-	
+
    _init: function() {
    	// create popup
    	this._createpopup();
@@ -32,13 +32,14 @@ $.widget("ui.moksha_popup", {
    	var $e = this.element;
    	var o = this.options;
    	this.timer = null;
+
    	$e.children(':first').addClass(o.selectedClass);
-                if (this.showFx) {
+        if (this.showFx) {
    		this.$panel.animate(this.showFx, this.showFx.duration || this.baseFx.duration);
    	} else {
    		this.$panel.show();
    	}
-		
+
    },

hidePopup: function() {
@@ -55,6 +56,7 @@ $.widget("ui.moksha_popup", {
    _startHover: function() {
    	var self = this;
    	var o = this.options;
+		moksha.debug('Hover Started');
    	this.timer = setTimeout(function () {self.showPopup.apply(self)}, o.hoverTimeout);
    },

@@ -83,13 +85,14 @@ $.widget("ui.moksha_popup", {
    	}

this.$panel = $panel.addClass(o.panelClass);
-		
+		this.$panel.hide()
+
    	// set up animations
    	var hideFx, showFx, baseFx = { 'min-height': 0, duration: 1 }, baseDuration = 'normal';
    	if (o.fx && o.fx.constructor == Array)
    		hideFx = o.fx[0] || baseFx, showFx = o.fx[1] || baseFx;
    	else
-			hideFx = showFx = o.fx || baseFx;
+			hideFx = showFx = o.fx

this.hideFx = hideFx;
    	this.showFx = showFx;
@@ -101,7 +104,7 @@ $.widget("ui.moksha_popup", {
    	        var self = this;
    		$e.hover(function () {self._startHover.apply(self)}, function () {self._endHover.apply(self)});
    	}
-		
+
    }
 });