You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2013/08/16 21:03:08 UTC

svn commit: r1514851 - /rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js

Author: mfranklin
Date: Fri Aug 16 19:03:08 2013
New Revision: 1514851

URL: http://svn.apache.org/r1514851
Log:
Fixed widget menu remains open after item is clicked (RAVE-1041)

Modified:
    rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js

Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js?rev=1514851&r1=1514850&r2=1514851&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js Fri Aug 16 19:03:08 2013
@@ -691,28 +691,36 @@ define(["jquery", "underscore", "rave",
                 self.$cogIcon.click(addIframeOverlays);
                 self.$cogIcon.dropdown();
                 if (!self.$menuItemMove.hasClass("menu-item-disabled")) {
-                    self.$menuItemMove.click(showMovePageDialog);
+                    self.$menuItemMove.click(getLaunchClosure(showMovePageDialog));
                 }
                 if (!self.$menuItemDelete.hasClass("menu-item-disabled")) {
-                    self.$menuItemDelete.click(deleteWidget);
+                    self.$menuItemDelete.click(getLaunchClosure(deleteWidget));
                 }
                 if (!self.$menuItemMaximize.hasClass("menu-item-disabled")) {
-                    self.$menuItemMaximize.click(maximize);
+                    self.$menuItemMaximize.click(getLaunchClosure(maximize));
                 }
                 if (!self.$menuItemAbout.hasClass("menu-item-disabled")) {
-                    self.$menuItemAbout.click(aboutWidget)
+                    self.$menuItemAbout.click(getLaunchClosure(aboutWidget));
                 }
                 if (!self.$menuItemComment.hasClass("menu-item-disabled")) {
-                    self.$menuItemComment.click(commentOnWidget);
+                    self.$menuItemComment.click(getLaunchClosure(commentOnWidget));
                 }
                 if (!self.$menuItemRate.hasClass("menu-item-disabled")) {
-                    self.$menuItemRate.click(rateWidget);
+                    self.$menuItemRate.click(getLaunchClosure(rateWidget));
                 }
                 var metadata = self.widget.metadata;
                 if (metadata && (metadata.hasPrefsToEdit || (metadata.views && metadata.views.preferences))) {
                     self.$menuItemEditPrefs.removeClass("menu-item-disabled");
-                    self.$menuItemEditPrefs.click(showPrefsPane);
+                    self.$menuItemEditPrefs.click(getLaunchClosure(showPrefsPane));
                 }
+
+                function getLaunchClosure(fn) {
+                    return function(evt) {
+                        self.$cogIcon.dropdown();
+                        fn(evt);
+                    }
+                }
+
             }
             HomeView.prototype.getWidgetSite = function () {
                 return this.$widgetSite[0];