Quick view: fix for dialog actions

bfederle · bfederle · commit 65a526fa5424 · 2012-10-10T11:18:03.000-07:00
In some cases, clicking out of an overlayed dialog will cause an open
quick view to become stuck. This fixes via a new class 'hovered-elem'
which, when attached to any DOM element, will have its 'mouseleave'
triggered once the dialog is closed.
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
@@ -435,6 +435,8 @@
               $formContainer.remove();
               $(this).dialog('destroy');
 
+              $('.hovered-elem').trigger('mouseleave');
+
               return true;
             }
           },
@@ -445,6 +447,8 @@
               $('div.overlay').remove();
               $formContainer.remove();
               $(this).dialog('destroy');
+
+              $('.hovered-elem').trigger('mouseleave');
             }
           }
         ]
@@ -513,6 +517,7 @@
               $(this).dialog('destroy');
               $('div.overlay').remove();
               if (args.cancelAction) { args.cancelAction(); }
+              $('.hovered-elem').trigger('mouseleave');
             }
           },
           {
@@ -522,6 +527,7 @@
               args.action();
               $(this).dialog('destroy');
               $('div.overlay').remove();
+              $('.hovered-elem').trigger('mouseleave');
             }
           }
         ]
@@ -548,6 +554,7 @@
             click: function() {
               $(this).dialog('destroy');
               if (args.clickAction) args.clickAction();
+              $('.hovered-elem').trigger('mouseleave');
             }
           }
         ]
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
@@ -1033,7 +1033,7 @@
         $quickView.mouseover(
           // Show quick view
           function() {
-            var $quickViewTooltip = $('<div>').addClass('quick-view-tooltip');
+            var $quickViewTooltip = $('<div>').addClass('quick-view-tooltip hovered-elem');
             var $tr = $quickView.closest('tr');
             var $listView = $tr.closest('.list-view');
             var $title = $('<div>').addClass('title');

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,8 @@`
`435`	`435`	`$formContainer.remove();`
`436`	`436`	`$(this).dialog('destroy');`
`437`	`437`
	`438`	`+ $('.hovered-elem').trigger('mouseleave');`
	`439`	`+`
`438`	`440`	`return true;`
`439`	`441`	`}`
`440`	`442`	`},`
`@@ -445,6 +447,8 @@`
`445`	`447`	`$('div.overlay').remove();`
`446`	`448`	`$formContainer.remove();`
`447`	`449`	`$(this).dialog('destroy');`
	`450`	`+`
	`451`	`+ $('.hovered-elem').trigger('mouseleave');`
`448`	`452`	`}`
`449`	`453`	`}`
`450`	`454`	`]`
`@@ -513,6 +517,7 @@`
`513`	`517`	`$(this).dialog('destroy');`
`514`	`518`	`$('div.overlay').remove();`
`515`	`519`	`if (args.cancelAction) { args.cancelAction(); }`
	`520`	`+ $('.hovered-elem').trigger('mouseleave');`
`516`	`521`	`}`
`517`	`522`	`},`
`518`	`523`	`{`
`@@ -522,6 +527,7 @@`
`522`	`527`	`args.action();`
`523`	`528`	`$(this).dialog('destroy');`
`524`	`529`	`$('div.overlay').remove();`
	`530`	`+ $('.hovered-elem').trigger('mouseleave');`
`525`	`531`	`}`
`526`	`532`	`}`
`527`	`533`	`]`
`@@ -548,6 +554,7 @@`
`548`	`554`	`click: function() {`
`549`	`555`	`$(this).dialog('destroy');`
`550`	`556`	`if (args.clickAction) args.clickAction();`
	`557`	`+ $('.hovered-elem').trigger('mouseleave');`
`551`	`558`	`}`
`552`	`559`	`}`
`553`	`560`	`]`