Aggregate the JS and CSS files (we own) that are loaded on every page.

xwiki-platform-core/xwiki-platform-web/pom.xml

@@ -114,11 +114,39 @@
             <!-- Exclude files with complex Velocity code inside -->
             <!-- This one iterates over xobjects of type XWiki.SearchSuggestSourceClass -->
             <exclude>**/searchSuggest.js</exclude>
-            <!-- The following stylesheets use the css3_backgroundLinearGradient Velocity macro which expects a map as
-              parameter and the curly brackets have special meaning in CSS. -->
-            <exclude>**/modalPopup.css</exclude>
-            <exclude>**/dashboard.css</exclude>
           </excludes>
+          <aggregations>
+            <!-- Aggregate the JavaScript code that is loaded on every page. -->
+            <aggregation>
+              <insertNewLine>true</insertNewLine>
+              <inputDir>${project.build.directory}/minimized</inputDir>
+              <output>${project.build.directory}/minimized/resources/js/xwiki/xwiki-min.js</output>
+              <includes>
+                <include>**/xwiki.js</include>
+                <include>**/entityReference.js</include>
+                <include>**/modalPopup.js</include>
+                <include>**/jumpToPage.js</include>
+                <include>**/confirmationBox.js</include>
+                <include>**/confirmedAjaxRequest.js</include>
+                <include>**/notification.js</include>
+                <include>**/xlist.js</include>
+                <include>**/suggest.js</include>
+              </includes>
+            </aggregation>
+            <!-- Aggregate the CSS code that is loaded on every page. -->
+            <aggregation>
+              <insertNewLine>true</insertNewLine>
+              <inputDir>${project.build.directory}/minimized</inputDir>
+              <output>${project.build.directory}/minimized/resources/css/xwiki-min.css</output>
+              <includes>
+                <include>**/modalPopup.css</include>
+                <include>**/jumpToPage.css</include>
+                <include>**/confirmationBox.css</include>
+                <include>**/notification.css</include>
+                <include>**/suggest.css</include>
+              </includes>
+            </aggregation>
+          </aggregations>
         </configuration>
       </plugin>
     </plugins>

xwiki-platform-core/xwiki-platform-web/src/main/webapp/resources/uicomponents/widgets/notification.css

@@ -44,7 +44,7 @@
     #end
   #end
 /** $notificationType */
-.xnotification-$notificationType {
+.xnotification-${notificationType} {
   background-color: $bgColor;
   color:  $textColor;
   border-color:  $textColor;

xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/javascript.vm

@@ -2,8 +2,12 @@
 ## JS Libraries.
 ##
 $xwiki.jsfx.use('js/prototype/prototype.js', {'defer': false})
-$xwiki.jsfx.use('js/xwiki/xwiki.js', {'forceSkinAction': true, 'defer': false})
 $xwiki.jsfx.use('js/scriptaculous/effects.js', true)
+$xwiki.jsfx.use('js/xwiki/xwiki-min.js', {'forceSkinAction': true, 'defer': false, 'language': $xcontext.language})
+$xwiki.ssfx.use('css/xwiki-min.css', {'forceSkinAction': true, 'colorTheme': $themeDoc, 'language': $xcontext.language})
+## The following resources are aggregated by the previous two.
+#*
+$xwiki.jsfx.use('js/xwiki/xwiki.js', {'forceSkinAction': true, 'defer': false})
 $xwiki.jsfx.use('js/xwiki/widgets/modalPopup.js', true)
 $xwiki.ssfx.use('js/xwiki/widgets/modalPopup.css', {'forceSkinAction' : true, 'colorTheme' : $themeDoc})
 $xwiki.jsfx.use('js/xwiki/widgets/jumpToPage.js', true)
@@ -17,6 +21,7 @@ $xwiki.ssfx.use('uicomponents/widgets/notification.css', true)
 $xwiki.jsfx.use('uicomponents/widgets/list/xlist.js')
 $xwiki.jsfx.use('uicomponents/suggest/suggest.js', {'forceSkinAction' : true, 'language' : $xcontext.language})
 $xwiki.ssfx.use('uicomponents/suggest/suggest.css', true)
+*#
 #if($xwiki.exists('XWiki.SearchSuggestConfig'))
   ## Hook to request the search suggest script if search suggest configuration is present.
   ## We can't just have it as a always-use SSX yet since we compute a hash to be sure to refresh
@@ -33,8 +38,8 @@ $xwiki.ssfx.use('uicomponents/suggest/suggest.css', true)
       #end
     #end
     $xwiki.jsfx.use('uicomponents/search/searchSuggest.js', {
-      'forceSkinAction' : true,  
-      'h' : $searchSuggestConfigHash.hashCode()  
+      'forceSkinAction' : true,
+      'h' : $searchSuggestConfigHash.hashCode()
     })
     $xwiki.ssfx.use('uicomponents/search/searchSuggest.css', true)
   #end

xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/macros.vm

@@ -2375,9 +2375,9 @@ $string##
     ## Needed for sorting the selected values.
     #set ($discard = $xwiki.jsfx.use('js/scriptaculous/dragdrop.js'))
   #end
-  ## Needed for displaying a list of suggestions based on the user input.
-  #set ($discard = $xwiki.ssfx.use('uicomponents/suggest/suggest.css', true))
-  #set ($discard = $xwiki.jsfx.use('uicomponents/suggest/suggest.js', true))
+  ## Needed for displaying a list of suggestions based on the user input (included by default).
+  ##set ($discard = $xwiki.ssfx.use('uicomponents/suggest/suggest.css', true))
+  ##set ($discard = $xwiki.jsfx.use('uicomponents/suggest/suggest.js', true))
   ## Needed for managing the selected values. In single selection mode the value selected from the list of suggestions
   ## overwrites the previously selected value.
   #set ($discard = $xwiki.ssfx.use('uicomponents/suggest/suggestPicker.css', true))