Merge branch 'dev' of https://github.com/nkashyap/console.io into dev

nkashyap · Aug 28, 2013 · abb4a4f · abb4a4f
2 parents 4d011d1 + 03dedeb
commit abb4a4f
Show file tree

Hide file tree

Showing 20 changed files with 4,532 additions and 39 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -0,0 +1,64 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: nisheeth
+ * Date: 27/08/13
+ * Time: 19:39
+ * To change this template use File | Settings | File Templates.
+ */
+
+module.exports = function (grunt) {
+
+    // Project configuration.
+    grunt.initConfig({
+        pkg: grunt.file.readJSON('package.json'),
+        concat: {
+            dist: {
+                // the files to concatenate
+                src: [
+                    'src/util.js',
+                    'src/storage.js',
+                    'src/events.js',
+                    'src/stringify.js',
+                    'src/stacktrace.js',
+                    'src/transport.js',
+                    'src/console.js',
+                    'src/client.js',
+                    'src/console.io.js'],
+                // the location of the resulting JS file
+                dest: 'dist/<%= pkg.name %>.js'
+            }
+        },
+        uglify: {
+            options: {
+                // the banner is inserted at the top of the output
+                banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
+            },
+            dist: {
+                files: {
+                    'dist/<%= pkg.name %>.min.js': ['<%= concat.dist.dest %>']
+                }
+            }
+        },
+        jshint: {
+            // define the files to lint
+            files: ['gruntfile.js', 'src/**/*.js', 'app/**/*.js', 'server/**/*.js'],
+            // configure JSHint (documented at http://www.jshint.com/docs/)
+            options: {
+                // more options here if you want to override JSHint defaults
+                globals: {
+                    console: true,
+                    module: true
+                }
+            }
+        }
+    });
+
+    grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-contrib-jshint');
+    //grunt.loadNpmTasks('grunt-contrib-qunit');
+    //grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-contrib-concat');
+
+    // Default task(s).
+    grunt.registerTask('default', ['concat', 'uglify']);
+};
diff --git a/build.bat b/build.bat
@@ -0,0 +1,2 @@
+grunt default
+pause
diff --git a/demo/demo.html b/demo/demo.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Console.IO - Demo HTTP - Test Page</title>
+    <!--<script src="http://www-thedictator.bbdev1.com:8082/socket.io/socket.io.js" type="text/javascript"></script>-->
+    <!--<script src="http://www-thedictator.bbdev1.com:8082/addons/console.js" type="text/javascript"></script>-->
+    <!--<script src="http://www-thedictator.bbdev1.com:8082/addons/socket.js" type="text/javascript"></script>-->
+    <!--<script src="http://www-thedictator.bbdev1.com:8082/addons/inject.js" type="text/javascript"></script>-->
+    <!--<script src="http://www-thedictator.bbdev1.com:8082/addons/inject.js?url=http://www-thedictator.bbdev1.com:8082&web=true" type="text/javascript"></script>-->
+
+    <script src="http://www-thedictator.bbdev1.com:8082/src/bin.js" type="text/javascript"></script>
+
+    <link rel="stylesheet" href="main.css" type="text/css">
+    <script type="text/javascript" src="main.js"></script>
+</head>
+<body>
+<div id="wrapper">
+    <h1 id="ConnectionMode">Info: </h1>
+    <ul id="log"></ul>
+    <div id="debug"></div>
+    <div id="dummy">
+        <div>This</div>
+        <div>is</div>
+        <div>Console.IO Demo</div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/demo/index.html b/demo/index.html
@@ -4,7 +4,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title>Console.IO - HTTP - Test Page</title>
-    <script src="../addons/inject.js?url=http://localhost:8082&web=true" type="text/javascript"></script>
+    <!--<script src="../addons/inject.js?url=http://localhost:8082&web=true" type="text/javascript"></script>-->
+    <script src="http://localhost:8082/console.io.js" type="text/javascript"></script>
 
     <link rel="stylesheet" href="main.css" type="text/css">
     <script type="text/javascript" src="main.js"></script>

diff --git a/demo/main.js b/demo/main.js
@@ -64,4 +64,5 @@ function init() {
     }, 2000);
 }
 
-window.InjectIO.ready(init);
+//window.InjectIO.ready(init);
+window.ConsoleIO.util.ready(init);