Changeset 5585 for VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/Application.java

Timestamp:

08/21/14 07:31:47 (10 years ago)

Author:

Twan Goosen

Message:

Suppressed jQuery javascript library import by WiQuery?
Refs #594

File:

• VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/Application.java (modified) (4 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/Application.java

@@ -20 +20 @@
 import org.apache.wicket.session.pagemap.LeastRecentlyAccessedEvictionStrategy;
 import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
+import org.odlabs.wiquery.core.commons.IWiQuerySettings;
+import org.odlabs.wiquery.core.commons.WiQuerySettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26 +28 @@
 
 @Component
-public class Application extends AuthenticatedWebApplication {
+public class Application extends AuthenticatedWebApplication implements IWiQuerySettings {
 
     private final static Logger logger = LoggerFactory.getLogger(Application.class);
-    
+
     @Autowired
     private VirtualCollectionRegistry registry;
@@ -99 +101 @@
         return false;
     }
-    
+
     boolean isAdmin(String user) {
         return adminUsersService.isAdmin(user);
     }
-    
+
     public VirtualCollectionRegistry getRegistry() {
         return registry;
@@ -116 +118 @@
     }
 
+    @Override
+    public WiQuerySettings getWiQuerySettings() {
+        final WiQuerySettings settings = new WiQuerySettings();
+        // WiQuery should not import the jQuery library because it is already
+        // provided in the template as a dependency of Bootstrap
+        settings.setAutoImportJQueryResource(false);
+        settings.setAutoImportJQueryUIResource(false);
+        return settings;
+    }
+
 } // class Application