SAK-32544 Upgrade elfinder to 2.1.23 (sakaiproject#4426)

Also included in this change:
- removing elfinder source and only use webjar
- yui compress sakai-elfinder artifacts
- general clean up

library/pom.xml

@@ -139,7 +139,7 @@
 		<dependency>
 			<groupId>org.webjars.bower</groupId>
 			<artifactId>elfinder</artifactId>
-			<version>2.1.12</version>
+			<version>2.1.23</version>
 			<scope>runtime</scope>
 			<exclusions>
 				<!-- The exclusions are because the bower versions don't have concat/min versions -->
@@ -323,6 +323,22 @@
 									</includes>
 									<output>${project.build.directory}/${project.build.finalName}/skin/${sakai.skin.target}/js/morpheus.plugins.min.js</output>
 								</aggregation>
+								<aggregation>
+									<inputDir>src/webapp/editor/elfinder/sakai/js/src</inputDir>
+									<includes>
+										<include>sakai.js</include>
+										<include>query.js</include>
+										<include>tools.js</include>
+										<include>ui.js</include>
+										<include>resizer.js</include>
+										<include>options.js</include>
+										<include>editors.js</include>
+										<include>confirm.js</include>
+										<include>i18n.js</include>
+										<include>init.js</include>
+									</includes>
+									<output>${project.build.directory}/${project.build.finalName}/editor/elfinder/sakai/js/sakai-elfinder.min.js</output>
+								</aggregation>
 							</aggregations>
 						</configuration>
 					</plugin>
@@ -438,6 +454,7 @@
 				<artifactId>maven-war-plugin</artifactId>
 				<version>3.0.0</version>
 				<configuration>
+					<warSourceExcludes>editor/elfinder/sakai/js/src/**</warSourceExcludes>
 					<webResources>
 						<resource>
 							<directory>src/webapp-filtered</directory>

library/src/webapp-filtered/editor/ckeditor.launch.js

@@ -79,11 +79,7 @@ sakai.editor.editors.ckeditor.launch = function(targetId, config, w, h) {
     var country = sakai.locale && sakai.locale.userCountry || null;
 
     if (sakai.editor.editors.ckeditor.browser === "elfinder") {
-        // Flag for setting elfinder to build or source version
-        // Must be either 'src' or 'build'
-        var elfinderBuild = 'build';
-        var elfinderUrl = '/library/editor/elfinder/sakai/elfinder.' + elfinderBuild +
-            '.html?connector=elfinder-connector/elfinder-servlet/connector';
+        var elfinderUrl = '/library/editor/elfinder/sakai/elfinder.html?connector=elfinder-connector/elfinder-servlet/connector';
 
         // Add tilde to userId in order to avoid permission error while getting resources from user workspace
         collectionId = collectionId.replace('/user/','/user/~');

library/src/webapp/editor/elfinder/sakai/README.md

@@ -1,11 +1,9 @@
 # elFinder Sakai Configuration
 The files in this directory are Sakai-specific configurations for elFinder 2.1.
 
-## Build vs Source
-`elfinder.src.html` uses the elFinder 2.1 source code (in `../src/`)
+## Html 
 
-`elfinder.build.html` uses a compressed/built version of elFinder 2.1 (in
-`../build/`)
+`elfinder.html` uses a compressed/built version of elFinder 2.1
 
 ## Initialization
 The client-side initialization is done by the scripts in `./js/`.
@@ -21,17 +19,3 @@ https://github.com/lokothodida/elfinder-theme-moono
 
 Furthermore, Javascript has been used to modify/move certain UI elements within
 elFinder. These are defined in `./js/ui.js`.
-
-## Building Sakai changes
-If changes are made to the source files in `./js`, rebuild them into `./js/build.min.js`
-by issuing the following Node.js commands from this folder:
-
-* Install the node dependencies:
-    ```
-    $ npm install
-    ```
-
-* Build the changes:
-    ```
-    $ npm run build
-    ```

library/src/webapp/editor/elfinder/sakai/elfinder.build.html → library/src/webapp/editor/elfinder/sakai/elfinder.html

@@ -9,8 +9,8 @@
     <script src="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js"></script>
 
   <!-- elFinder CSS (REQUIRED) -->
-  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.12/css/elfinder.min.css">
-  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.12/css/theme.css">
+  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.23/css/elfinder.min.css">
+  <link rel="stylesheet" type="text/css" href="/library/webjars/elfinder/2.1.23/css/theme.css">
 
   <!-- Moono Theme CSS -->
   <link rel="stylesheet" href="/library/webjars/fontawesome/4.7.0/css/font-awesome.min.css">
@@ -20,11 +20,11 @@
   <link rel="stylesheet" type="text/css" href="css/sakai-11/theme.css">
 
   <!-- elFinder JS (REQUIRED) -->
-  <script src="/library/webjars/elfinder/2.1.12/js/elfinder.min.js"></script>
+  <script src="/library/webjars/elfinder/2.1.23/js/elfinder.min.js"></script>
 
   <!-- elFinder initialization (REQUIRED) -->
   <!-- Some initialization for Sakai-specific config is done first -->
-  <script src="js/build.min.js"></script>
+  <script src="js/sakai-elfinder.min.js"></script>
 </head>
 
 <body>