Changeset 6592

Timestamp:

Nov 12, 2014, 1:58:23 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1885: Plugin definitions view plug-in page uses onactivate event

Also fixed on the plug-in configurations page.

Location:

branches/3.3-stable/www/admin

Files:

• pluginconfigurations/configurations.js (modified) (1 diff)
• pluginconfigurations/view_configuration.jsp (modified) (1 diff)
• plugindefinitions/plugins.js (modified) (1 diff)
• plugindefinitions/view_plugin.jsp (modified) (1 diff)

branches/3.3-stable/www/admin/pluginconfigurations/configurations.js

@@ -69 +69 @@
       Buttons.addClickHandler('btnConfigure', configurations.configurePlugin, attributes);
       
+      if (Doc.element('main.annotations'))
+      {
+        TabControl.addTabActivateListener('main.annotations', AnnotationsList.loadOnce);
+      }
       TabControl.addTabActivateListener('main.history', History.loadOnce);
     }

branches/3.3-stable/www/admin/pluginconfigurations/view_configuration.jsp

@@ -404 +404 @@
       <t:tab id="annotations" title="Annotations" 
         tooltip="View annotation values" clazz="white"
-        visible="<%=plugin != null && plugin.supports("net.sf.basedb.core.plugin.AnnotationSetterPlugin") %>"
-        activate="AnnotationsList.loadOnce()">
+        visible="<%=plugin != null && plugin.supports("net.sf.basedb.core.plugin.AnnotationSetterPlugin") %>">
         <jsp:include page="../../common/annotations/list_frameset.jsp">
           <jsp:param name="item_type" value="<%=itemType.name()%>" />

branches/3.3-stable/www/admin/plugindefinitions/plugins.js

@@ -118 +118 @@
       Buttons.addClickHandler('btnUnload', plugins.unloadPlugin, attributes);
       Buttons.addClickHandler('btnToggleDisabled', plugins.toggleDisabled);
-      
+
+      if (Doc.element('main.annotations'))
+      {
+        TabControl.addTabActivateListener('main.annotations', AnnotationsList.loadOnce);
+      }
       TabControl.addTabActivateListener('main.history', History.loadOnce);
     }

branches/3.3-stable/www/admin/plugindefinitions/view_plugin.jsp

@@ -675 +675 @@
     <t:tab id="annotations" title="Annotations" 
       tooltip="View annotation values" clazz="white"
-      visible="<%=!plugin.requiresConfiguration() && plugin.supports("net.sf.basedb.core.plugin.AnnotationSetterPlugin") %>"
-      activate="AnnotationsList.loadOnce()">
+      visible="<%=!plugin.requiresConfiguration() && plugin.supports("net.sf.basedb.core.plugin.AnnotationSetterPlugin") %>">
       <jsp:include page="../../common/annotations/list_frameset.jsp">
         <jsp:param name="item_type" value="<%=itemType.name()%>" />