build v2.0.0

jsxc · May 8, 2015 · 67858dc · 67858dc
1 parent ee7a73b
commit 67858dc
Show file tree

Hide file tree

Showing 49 changed files with 10,910 additions and 15,535 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ node_modules
 .buildpath
 .classpath
 config.inc.php
+archives/
+css/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+v2.0.0 / 2015-05-08
+===
+- upgrade jsxc to v2.0.0
+- display roster minimized after login
+
 v1.0.0 / 2014-11-06
 ===
 init with jsxc v1.0.0
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -14,10 +14,10 @@ module.exports = function(grunt) {
          gruntfile: {
             src: 'Gruntfile.js'
          },
-         files: [ 'js/sjsxc.js' ]
+         files: [ 'js/ijsxc.js' ]
       },
       copy: {
-         main: {
+         build: {
             files: [ {
                expand: true,
                src: [ 'js/*.js', '!js/sjsxc.config.js', 'js/lib/*.js', 'css/*', 'ajax/*', 'img/*', 'classes/*', 'config.inc.php.sample', 'plugin.php', 'LICENSE' ],
@@ -28,9 +28,20 @@ module.exports = function(grunt) {
                src: [ '**' ],
                dest: 'build/js/jsxc/'
             } ]
+         },
+         css: {
+            files: [ {
+               expand: true,
+               cwd: 'js/jsxc/lib/',
+               src: ['*.css'],
+               dest: 'css/'
+            } ]
          }
       },
-      clean: [ 'build/' ],
+      clean: {
+         build: [ 'build/' ],
+         css: ['css/']
+      },
       usebanner: {
          dist: {
             options: {
@@ -81,16 +92,47 @@ module.exports = function(grunt) {
       compress: {
          main: {
             options: {
-               archive: "ijsxc-<%= app.version %>.zip"
+               archive: "archives/ijsxc-<%= app.version %>.zip"
             },
             files: [ {
                src: [ '**' ],
                expand: true,
-               dest: 'sjsxc/',
+               dest: 'ijsxc/',
                cwd: 'build/'
             } ]
          }
-      }
+      },
+      autoprefixer: {
+         no_dest: {
+             src: 'css/*.css'
+         }
+      },
+      sass: {
+         options: {
+            imagePath: '../js/jsxc/img'
+         },
+         dist: {
+             files: {
+                'css/jsxc.ilias.css': 'scss/jsxc.ilias.scss'
+             }
+         }
+       },
+       dataUri: {
+          dist: {
+            src: 'css/jsxc.ilias.css',
+            dest: 'build/css/',
+            options: {
+              target: ['img/*.*', 'js/jsxc/img/*.*', 'js/jsxc/img/**/*.*'],
+              maxBytes: 2048
+            }
+          }
+        },
+        watch: {
+            css: {
+                files: ['js/jsxc/scss/*', 'scss/*'],
+                tasks: ['sass', 'autoprefixer']
+            }
+        }
    });
 
    // These plugins provide necessary tasks.
@@ -101,9 +143,20 @@ module.exports = function(grunt) {
    grunt.loadNpmTasks('grunt-banner');
    grunt.loadNpmTasks('grunt-search');
    grunt.loadNpmTasks('grunt-contrib-compress');
+   grunt.loadNpmTasks('grunt-sass');
+   grunt.loadNpmTasks('grunt-autoprefixer');
+   grunt.loadNpmTasks('grunt-data-uri');
+   grunt.loadNpmTasks('grunt-contrib-watch');
 
    // Default task.
-   grunt.registerTask('default', [ 'jshint', 'search', 'clean', 'copy', 'usebanner', 'replace', 'compress' ]);
+   grunt.registerTask('default', [ 'build', 'watch' ]);
 
-   grunt.registerTask('pre', [ 'jshint', 'search:console', 'clean', 'copy', 'usebanner', 'replace', 'compress' ]);
+   grunt.registerTask('build', ['jshint', 'clean:css', 'copy:css', 'sass', 'autoprefixer']);
+
+   grunt.registerTask('build:prerelease', ['search:console', 'clean:build', 'build', 'copy:build', 'dataUri', 'usebanner', 'replace', 'compress']);
+
+   grunt.registerTask('build:release', ['search:changelog', 'build:prerelease']);
+
+   // Create alpha/beta build @deprecated
+   grunt.registerTask('pre', [ 'build:prerelease' ]);
 };
diff --git a/build/classes/class.ilijsxcPlugin.php b/build/classes/class.ilijsxcPlugin.php
@@ -6,7 +6,7 @@
  * Example user interface plugin
  *
  * @author Klaus Herberth <[email protected]>
- * @version 1.0.0
+ * @version 2.0.0
  *
  */
 class ilijsxcPlugin extends ilUserInterfaceHookPlugin

diff --git a/build/classes/class.ilijsxcUIHookGUI.php b/build/classes/class.ilijsxcUIHookGUI.php
@@ -7,53 +7,37 @@
  * User interface hook class
  *
  * @author Klaus Herberth <[email protected]>
- * @version 1.0.0
+ * @version 2.0.0
  * @ingroup ServicesUIComponent
  */
 class ilijsxcUIHookGUI extends ilUIHookPluginGUI
 {
 
 	private $webroot = './Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/ijsxc/';
 	private $jsFiles = array(
-			productive => array(
+	   'development' => array(
 				'js/lib/jquery.ui.min.js',
+			   'js/jsxc/dev/lib/jquery.colorbox-min.js',
+			   'js/jsxc/dev/lib/jquery.slimscroll.js',
+			   'js/jsxc/dev/lib/jquery.fullscreen.js',
+			   'js/jsxc/dev/lib/jsxc.dep.js',
+			   'js/jsxc/dev/jsxc.js',
+			   'js/ijsxc.js'
+	   ),
+	   'productive' => array(
+	         'js/lib/jquery.ui.min.js',
 			   'js/jsxc/lib/jquery.colorbox-min.js',
 			   'js/jsxc/lib/jquery.slimscroll.js',
 			   'js/jsxc/lib/jquery.fullscreen.js',
 			   'js/jsxc/lib/jsxc.dep.min.js',
 			   'js/jsxc/jsxc.min.js',
 			   'js/ijsxc.js'
-			),
-			development => array(
-				'js/lib/jquery.ui.min.js',
-			   'js/jsxc/lib/jquery.colorbox-min.js',
-			   'js/jsxc/lib/jquery.slimscroll.js',
-			   'js/jsxc/lib/jquery.fullscreen.js',
-			   'js/jsxc/lib/strophe.js',
-			   'js/jsxc/lib/strophe.muc.js',
-			   'js/jsxc/lib/strophe.disco.js',
-			   'js/jsxc/lib/strophe.caps.js',
-			   'js/jsxc/lib/strophe.vcard.js',
-			   'js/jsxc/lib/strophe.jingle/strophe.jingle.js',
-			   'js/jsxc/lib/strophe.jingle/strophe.jingle.session.js',
-			   'js/jsxc/lib/strophe.jingle/strophe.jingle.sdp.js',
-			   'js/jsxc/lib/strophe.jingle/strophe.jingle.adapter.js',
-			   'js/jsxc/lib/otr/build/dep/salsa20.js',
-			   'js/jsxc/lib/otr/build/dep/bigint.js',
-			   'js/jsxc/lib/otr/build/dep/crypto.js',
-			   'js/jsxc/lib/otr/build/dep/eventemitter.js',
-			   'js/jsxc/lib/otr/build/otr.js',
-			   'js/jsxc/jsxc.lib.js',
-			   'js/jsxc/jsxc.lib.webrtc.js',
-			   'js/ijsxc.js'
-			)
+	   )
 	);
 
 	private $cssFiles = array(
 			'css/jquery-ui.min.css', 
 			'css/jquery.colorbox.css', 
-			'js/jsxc/jsxc.css', 
-			'js/jsxc/jsxc.webrtc.css', 
 			'css/jsxc.ilias.css'
 	);
 
@@ -74,7 +58,7 @@ function getHTML($a_comp, $a_part, $a_par = array())
 	{
 		global $ilCtrl, $ilUser, $ijsxc_config;
 
-		$env = ($ijsxc_config['debug'] === true) ? 'development' : 'productive';
+		$env = ($ijsxc_config['env'] === 'dev') ? 'development' : 'productive';
 
 		if ($a_part == 'template_load' && !$ilCtrl->IsAsynch() && strtolower($a_par['tpl_id']) == 'tpl.main.html') {
 			$html = '';

diff --git a/build/config.inc.php.sample b/build/config.inc.php.sample
@@ -1,6 +1,5 @@
 <?php
 $ijsxc_config = array (
-		debug => false,
 		xmpp => array (
 				/** url to bosh server binding. */
 				url => '/http-bind/',

diff --git a/build/css/jquery-ui.min.css b/build/css/jquery-ui.min.css