update system-info module

node_modules/.bin/build.js

@@ -33,39 +33,50 @@
         }
     ],
     "paths": {
-        "layout": "layout",
-        "jquery": "lib/jquery-1.11.1.min",
-        //"jquery": "lib/jquery-2.1.1.min",
-        //"jqueryUI": "lib/jquery-ui.min",
-        "jqueryUI": "lib/jquery-ui-custom.min", // custom script (without tooltip -> conflict with bootstrap)
-        "bootstrap": "lib/bootstrap.min",
-        "text": "lib/requirejs/text",
-        "templates": "../templates",
-        "jsPlumb": "lib/jsPlumb-1.6.4-min",
-        "customScrollbar": "lib/jquery.mCustomScrollbar.concat.min",
-        "datatables": "lib/jquery.dataTables.min",
-        "datatablesBootstrap": "lib/dataTables.bootstrap", // not used (bootstrap style)
-        "xEditable": "lib/bootstrap-editable.min"
+        layout: "layout",
+        jquery: "lib/jquery-1.11.1.min",
+        //jquery: "lib/jquery-2.1.1.min",
+        //jqueryUI: "lib/jquery-ui.min",
+        jqueryUI: "lib/jquery-ui-custom.min",                         // custom script (without tooltip -> conflict with bootstrap)
+        bootstrap: "lib/bootstrap.min",
+        text: "lib/requirejs/text",
+        templates: "../templates",
+        jsPlumb: "lib/jsPlumb-1.6.4-min",                             // main map draw plugin
+        customScrollbar: "lib/jquery.mCustomScrollbar.concat.min",    // custom scroll bars
+        datatables: "lib/jquery.dataTables.min",                      // tables
+        datatablesBootstrap: "lib/dataTables.bootstrap",              // not used (bootstrap style)
+        xEditable: "lib/bootstrap-editable.min",                      // in placed editing
+        morris: "lib/morris.min",                                     // graphs
+        raphael: "lib/raphael-min",                                     // required for morris (dependency)
+        bootbox: "lib/bootbox.min"                                    // custom dialogs
     },
     shim: {
-        "jqueryUI": {
-            export:"$",
-            deps: ["jquery"]
+        jqueryUI: {
+            export: '$',
+            deps: ['jquery']
         },
-        "bootstrap": {
-            deps: ["jquery", "jqueryUI"]
+        bootstrap: {
+            deps: ['jquery', 'jqueryUI']
         },
-        "customScrollbar": {
-            deps: ["jquery"]
+        customScrollbar: {
+            deps: ['jquery']
         },
-        "datatables": {
-            deps: ["jquery"]
+        datatables: {
+            deps: ['jquery']
         },
-        "datatablesBootstrap": {
-            deps: ["datatables"]
+        datatablesBootstrap: {
+            deps: ['datatables']
         },
-        "xEditable": {
-            deps: ["bootstrap"]
+        xEditable: {
+            deps: ['bootstrap']
+        },
+        bootbox: {
+            deps: ['jquery', 'bootstrap'],
+            exports: 'bootbox'
+        },
+        morris: {
+            deps: ['jquery', 'raphael'],
+            exports: 'Morris'
         }
     },
 
@@ -80,31 +91,41 @@
     //- "closure.keepLines": Same as closure option, but keeps line returns
     //in the minified files.
     //- "none": no minification will be done.
-    optimize: "uglify",
+    optimize: "uglify2",
 
-    //If using UglifyJS for script optimization, these config options can be
-    //used to pass configuration values to UglifyJS.
-    //See https://github.com/mishoo/UglifyJS for the possible values.
-    uglify: {
-        toplevel: true,
-        ascii_only: true,
-        beautify: true,
-        max_line_length: 1000,
-
-        //How to pass uglifyjs defined symbols for AST symbol replacement,
-        //see "defines" options for ast_mangle in the uglifys docs.
-        defines: {
-            DEBUG: ['name', 'false']
+    //If using UglifyJS2 for script optimization, these config options can be
+    //used to pass configuration values to UglifyJS2.
+    //For possible `output` values see:
+    //https://github.com/mishoo/UglifyJS2#beautifier-options
+    //For possible `compress` values see:
+    //https://github.com/mishoo/UglifyJS2#compressor-options
+    uglify2: {
+        //Example of a specialized config. If you are fine
+        //with the default options, no need to specify
+        //any of these properties.
+        output: {
+            beautify: false,
+            comments: false
         },
-
-        //Custom value supported by r.js but done differently
-        //in uglifyjs directly:
-        //Skip the processor.ast_mangle() part of the uglify call (r.js 2.0.5+)
-        no_mangle: true
+        compress: {
+            sequences: false,
+            drop_console: true,
+            global_defs: {
+                DEBUG: false
+            }
+        },
+        warnings: true,
+        mangle: true
     },
 
     //The directory path to save the output. If not specified, then
     //the path will default to be a directory called "build" as a sibling
     //to the build file. All relative paths are relative to the build file.
-    dir: "../../build_js"
+    dir: "../../build_js",
+
+    //Inlines the text for any text! dependencies, to avoid the separate
+    //async XMLHttpRequest calls to load those dependencies.
+    inlineText: false
+
+
 })