From d014f0cdae9b9df1e0eff01bcca3a7c46fb096ec Mon Sep 17 00:00:00 2001 From: Mattias Erming Date: Sun, 20 Jul 2014 14:22:23 -0700 Subject: [PATCH] Use /js/libs instead of /components --- Gruntfile.js | 19 ++----------------- client/index.html | 2 +- client/js/{components.min.js => libs.min.js} | 0 client/{components => js/libs}/favico.js | 0 client/{components => js/libs}/handlebars.js | 0 .../libs}/handlebars/equal.js | 0 .../{components => js/libs}/handlebars/uri.js | 0 client/{components => js/libs}/jquery.js | 0 .../libs}/jquery/bootstrap.js | 0 .../{components => js/libs}/jquery/cookie.js | 0 .../libs}/jquery/inputhistory.js | 0 .../libs}/jquery/stickyscroll.js | 0 .../libs}/jquery/tabcomplete.js | 0 client/{components => js/libs}/socket.io.js | 0 .../libs}/string.contains.js | 0 client/{components => js/libs}/uri.js | 0 package.json | 2 +- 17 files changed, 4 insertions(+), 19 deletions(-) rename client/js/{components.min.js => libs.min.js} (100%) rename client/{components => js/libs}/favico.js (100%) rename client/{components => js/libs}/handlebars.js (100%) rename client/{components => js/libs}/handlebars/equal.js (100%) rename client/{components => js/libs}/handlebars/uri.js (100%) rename client/{components => js/libs}/jquery.js (100%) rename client/{components => js/libs}/jquery/bootstrap.js (100%) rename client/{components => js/libs}/jquery/cookie.js (100%) rename client/{components => js/libs}/jquery/inputhistory.js (100%) rename client/{components => js/libs}/jquery/stickyscroll.js (100%) rename client/{components => js/libs}/jquery/tabcomplete.js (100%) rename client/{components => js/libs}/socket.io.js (100%) rename client/{components => js/libs}/string.contains.js (100%) rename client/{components => js/libs}/uri.js (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 33e598b2..dbc18dd5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,29 +6,14 @@ module.exports = function(grunt) { }, js: { files: { - "client/js/components.min.js": "client/components/**/*.js" + "client/js/libs.min.js": "client/js/libs/**/*.js" } } - }, - nodewebkit: { - src: "./**/*", - options: { - build_dir: "./build", - mac: false - } } }); grunt.loadNpmTasks("grunt-contrib-uglify"); - grunt.loadNpmTasks("grunt-node-webkit-builder"); - grunt.registerTask( - "build", - function() { - require("child_process").exec("rm -rf ./build"); - grunt.task.run("nodewebkit"); - } - ); grunt.registerTask( "default", - "uglify" + ["uglify"] ); }; diff --git a/client/index.html b/client/index.html index b47e1bb2..930ee996 100644 --- a/client/index.html +++ b/client/index.html @@ -253,7 +253,7 @@ - + diff --git a/client/js/components.min.js b/client/js/libs.min.js similarity index 100% rename from client/js/components.min.js rename to client/js/libs.min.js diff --git a/client/components/favico.js b/client/js/libs/favico.js similarity index 100% rename from client/components/favico.js rename to client/js/libs/favico.js diff --git a/client/components/handlebars.js b/client/js/libs/handlebars.js similarity index 100% rename from client/components/handlebars.js rename to client/js/libs/handlebars.js diff --git a/client/components/handlebars/equal.js b/client/js/libs/handlebars/equal.js similarity index 100% rename from client/components/handlebars/equal.js rename to client/js/libs/handlebars/equal.js diff --git a/client/components/handlebars/uri.js b/client/js/libs/handlebars/uri.js similarity index 100% rename from client/components/handlebars/uri.js rename to client/js/libs/handlebars/uri.js diff --git a/client/components/jquery.js b/client/js/libs/jquery.js similarity index 100% rename from client/components/jquery.js rename to client/js/libs/jquery.js diff --git a/client/components/jquery/bootstrap.js b/client/js/libs/jquery/bootstrap.js similarity index 100% rename from client/components/jquery/bootstrap.js rename to client/js/libs/jquery/bootstrap.js diff --git a/client/components/jquery/cookie.js b/client/js/libs/jquery/cookie.js similarity index 100% rename from client/components/jquery/cookie.js rename to client/js/libs/jquery/cookie.js diff --git a/client/components/jquery/inputhistory.js b/client/js/libs/jquery/inputhistory.js similarity index 100% rename from client/components/jquery/inputhistory.js rename to client/js/libs/jquery/inputhistory.js diff --git a/client/components/jquery/stickyscroll.js b/client/js/libs/jquery/stickyscroll.js similarity index 100% rename from client/components/jquery/stickyscroll.js rename to client/js/libs/jquery/stickyscroll.js diff --git a/client/components/jquery/tabcomplete.js b/client/js/libs/jquery/tabcomplete.js similarity index 100% rename from client/components/jquery/tabcomplete.js rename to client/js/libs/jquery/tabcomplete.js diff --git a/client/components/socket.io.js b/client/js/libs/socket.io.js similarity index 100% rename from client/components/socket.io.js rename to client/js/libs/socket.io.js diff --git a/client/components/string.contains.js b/client/js/libs/string.contains.js similarity index 100% rename from client/components/string.contains.js rename to client/js/libs/string.contains.js diff --git a/client/components/uri.js b/client/js/libs/uri.js similarity index 100% rename from client/components/uri.js rename to client/js/libs/uri.js diff --git a/package.json b/package.json index b6fc2fe3..b1385b31 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "shout", "description": "The modern IRC client", - "version": "0.8.1", + "version": "0.8.2", "homepage": "http://github.com/erming/shout", "author": { "name": "Mattias Erming",