Merge remote-tracking branch 'origin/dev1.1.0' into dev1.1.0

Gruntfile.js

-/*global module:false*/
+/*-----------------------------------------------------
+ * livereload Default Setting
+ *-----------------------------------------------------*/
+'use strict';
+var path = require('path');
+var lrSnippet = require('grunt-contrib-livereload/lib/utils').livereloadSnippet;
+
+/*-----------------------------------------------------
+ * Module Setting
+ *-----------------------------------------------------*/
 module.exports = function (grunt) {
 
     var banner = '/*!\n' +
@@ -50,28 +59,54 @@ module.exports = function (grunt) {
         },
 
         uglify: {
-
-            options: {
-
-            },
-
             minimize: {
-
                 files: {
                     'dist/kityminder.all.min.js': 'dist/kityminder.all.js'
                 }
-
             }
+        },
 
+        /* Start [Task liverload] ------------------------------------*/
+        livereload: {
+            port: 35729 // Default livereload listening port.
+        },
+        connect: {
+            livereload: {
+                options: {
+                    hostname: '*',
+                    port: 9001,
+                    base: '.',
+                    middleware: function(connect, options, middlewares) {
+                        return [
+                            lrSnippet,
+                            connect.static(options.base.toString()),
+                            connect.directory(options.base.toString())
+                        ]
+                    }
+                }
+            }
+        },
+        regarde: {
+            js:{
+                files: 'src/**/*.js',
+                tasks: ['default', 'livereload']
+            }
         }
+        /* End [Task liverload] ------------------------------------*/
 
     });
 
     // These plugins provide necessary tasks.
+    /* [Build plugin & task ] ------------------------------------*/
     grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-uglify');
-
-    // Default task.
+    // Build task(s).
     grunt.registerTask( 'default', [ 'concat:js', 'uglify:minimize' ] );
 
+    /* [liverload plugin & task ] ------------------------------------*/
+    grunt.loadNpmTasks('grunt-regarde');
+    grunt.loadNpmTasks('grunt-contrib-connect');
+    grunt.loadNpmTasks('grunt-contrib-livereload');
+    grunt.registerTask('live', ['livereload-start', 'connect', 'regarde']);
+
 };

dist/index.html

@@ -8,7 +8,7 @@
     <script src="social.js" charset="utf-8"></script>
     <script src="../kity/dist/kitygraph.all.js" charset="utf-8"></script>
     <script src="../configure.js" charset="utf-8"></script>
-    <script src="../dist/dev.php" charset="utf-8"></script>
+    <script src="./kityminder.all.min.js" charset="utf-8"></script>
     <script src="../lang/zh-cn/zh-cn.js" charset="utf-8"></script>
     <link href="../themes/default/css/import.css" type="text/css" rel="stylesheet">
     <link rel="stylesheet" href="social.css">

package.json

@@ -33,7 +33,10 @@
     "devDependencies": {
         "grunt": "~0.4.1",
         "grunt-contrib-concat": "~0.3.0",
-        "grunt-contrib-uglify": "~0.2.6"
+        "grunt-contrib-uglify": "~0.2.6",
+        "grunt-regarde": "latest",
+        "grunt-contrib-connect": "latest",
+        "grunt-contrib-livereload": "latest"
     }
 
 }
\ No newline at end of file