From 69e1e1907d7e598b3c3ed613586e5d9c3e7d8602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Mon, 11 Aug 2014 17:37:33 +0100 Subject: [PATCH 1/2] Use strict angular dependency injection Prerequisite for proper minification --- js/glowingbear.js | 13 +++++++------ js/localstorage.js | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/js/glowingbear.js b/js/glowingbear.js index 98a96ae..717b16e 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -1320,7 +1320,7 @@ weechat.config(['$routeProvider', ]); -weechat.directive('plugin', function($rootScope) { +weechat.directive('plugin', ['$rootScope', function($rootScope) { /* * Plugin directive * Shows additional plugin content @@ -1373,10 +1373,10 @@ weechat.directive('plugin', function($rootScope) { } } }; -}); +}]); -weechat.directive('inputBar', function() { +weechat.directive('inputBar', ['$rootScope', function() { return { @@ -1386,7 +1386,8 @@ weechat.directive('inputBar', function() { inputId: '@inputId' }, - controller: function($rootScope, + controller: ['$rootScope', '$scope', '$log', 'connection', 'models', + function($rootScope, $scope, $element, $log, @@ -1666,6 +1667,6 @@ weechat.directive('inputBar', function() { return true; } }; - } + }] }; -}); +}]); diff --git a/js/localstorage.js b/js/localstorage.js index 7c3e3b2..5909bf8 100644 --- a/js/localstorage.js +++ b/js/localstorage.js @@ -3,7 +3,7 @@ var ls = angular.module('localStorage',[]); -ls.factory("$store",function($parse){ +ls.factory("$store", ["$parse", function($parse){ /** * Global Vars */ @@ -113,5 +113,5 @@ ls.factory("$store",function($parse){ } }; return publicMethods; -}); +}]); })(); From 33d43ee28d8de4bd43869de85f7b55f81f33e600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Wed, 27 Aug 2014 17:30:16 +0100 Subject: [PATCH 2/2] Add minification --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 536fd28..35a94d8 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,14 @@ "bower": "^1.3.1", "shelljs": "^0.2.6", "jshint": "^2.5.2", - "karma-junit-reporter": "^0.2.2" + "karma-junit-reporter": "^0.2.2", + "uglify-js": "^2.4" }, "scripts": { "postinstall": "bower install", + "minify": " uglifyjs js/localstorage.js js/weechat.js js/irc-utils.js js/glowingbear.js js/websockets.js js/models.js js/plugins.js -c -m --screw-ie8 -o min.js --source-map min.map", + "prestart": "npm install", "start": "http-server -a localhost -p 8000",