Changeset 5585

Timestamp:

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

Author:

Twan Goosen

Message:

Suppressed jQuery javascript library import by WiQuery?
Refs #594

Location:

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

Files:

• Application.java (modified) (4 diffs)
• pages/BasePage.html (modified) (1 diff)

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

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html

@@ -7 +7 @@
         <title>CLARIN Virtual Collection Registry</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        
+        <!-- Bootstrap styles required for CLARIN style to work properly -->
         <link rel="stylesheet" type="text/css" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" />
+        <!-- CLARIN + VCR style compiled from SASS -->
         <link rel="stylesheet" type="text/css" href="css/vcr.css" />
+        
+        <!-- jQuery library for Bootstrap, WiQuery and custom use -->
         <script type="text/javascript" src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-        <script type="text/javascript" src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
+        <!-- Compatibility for WiQuery (depends on jQuery 1.5) TODO: investigate if this can be left out -->
+        <script type="text/javascript" src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script> 
+        <!-- Bootstrap required for CLARIN style to work properly -->
         <script charset="utf8" type="text/javascript" src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
     </head>