Merge branch 'feature/browserify'

pc035860 · Feb 3, 2015 · 2c4faf0 · 2c4faf0
2 parents 9264c82 + dcf5c95
commit 2c4faf0
Show file tree

Hide file tree

Showing 13 changed files with 1,270 additions and 42 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,10 @@
+{
+	"curly": true,
+	"multistr": true,
+	"expr": true,
+	"boss": true,
+	"undef": true,
+	"predef": [
+		"require", "define", "escape", "module"
+	]
+}
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,31 +1,44 @@
 module.exports = function(grunt) {
   grunt.initConfig({
+    modulename: 'hljs',
+    builddir: 'build',
     pkg: grunt.file.readJSON('package.json'),
+    meta: {
+      banner: 
+        '/*! <%= pkg.name %>\n' + 
+        'version: <%= pkg.version %>\n' +
+        'build date: <%= grunt.template.today("yyyy-mm-dd") %>\n' + 
+        'author: <%= pkg.author %>\n' + 
+        '<%= pkg.repository.url %> */'
+    },
     jshint: {
-      options: {
-        curly: true,
-        multistr: true,
-        expr: true,
-        boss: true,
-        undef: true
-      },
       beforeuglify: ['<%= pkg.name %>.js'],
       gruntfile: ['Gruntfile.js']
     },
-    uglify: {
+    concat: {
+      options: {
+        banner: '<%= meta.banner %>\n\n'+
+                '/* commonjs package manager support (eg componentjs) */\n'+
+                'if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){\n'+
+                '  module.exports = \'<%= modulename %>\';\n'+
+                '}\n\n'+
+                '(function (window, angular, undefined) {\n',
+        footer: '})(window, window.angular);'
+      },
       build: {
         src: '<%= pkg.name %>.js',
-        dest: '<%= pkg.name %>.min.js'
-      },
+        dest: '<%= builddir %>/<%= pkg.name %>.js'
+      }
+    },
+    uglify: {
       options: {
         mangle: true,
         compress: true,
-        banner: 
-          '/*! <%= pkg.name %>\n' + 
-          'version: <%= pkg.version %>\n' +
-          'build date: <%= grunt.template.today("yyyy-mm-dd") %>\n' + 
-          'author: <%= pkg.author %>\n' + 
-          '<%= pkg.repository.url %> */\n'
+        banner: '<%= meta.banner %>\n'
+      },
+      build: {
+        src: '<%= builddir %>/<%= pkg.name %>.js',
+        dest: '<%= builddir %>/<%= pkg.name %>.min.js'
       }
     },
     watch: {
@@ -53,7 +66,8 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-contrib-concat');
 
-  grunt.registerTask('default', ['jshint:beforeuglify', 'uglify']);
+  grunt.registerTask('default', ['jshint:beforeuglify', 'concat:build', 'uglify:build']);
 };
 
diff --git a/angular-highlightjs.js b/angular-highlightjs.js
@@ -1,7 +1,4 @@
 /*global angular*/
-(function (module) {
-
-var dirHljs, dirLanguageFactory, dirSourceFactory, dirIncludeFactory;
 
 function shouldHighlightStatics(attrs) {
   var should = true;
@@ -15,12 +12,13 @@ function shouldHighlightStatics(attrs) {
   return should;
 }
 
-module
+
+var ngModule = angular.module('hljs', []);
 
 /**
  * hljsService service
  */
-.provider('hljsService', function () {
+ngModule.provider('hljsService', function () {
   var _hljsOptions = {};
 
   return {
@@ -35,21 +33,21 @@ module
       return $window.hljs;
     }]
   };
-})
+});
 
 /**
  * hljsCache service
  */
-.factory('hljsCache', [
+ngModule.factory('hljsCache', [
          '$cacheFactory',
 function ($cacheFactory) {
   return $cacheFactory('hljsCache');
-}])
+}]);
 
 /**
  * HljsCtrl controller
  */
-.controller('HljsCtrl', [
+ngModule.controller('HljsCtrl', [
                   'hljsCache', 'hljsService',
 function HljsCtrl (hljsCache,   hljsService) {
   var ctrl = this;
@@ -133,10 +131,13 @@ function HljsCtrl (hljsCache,   hljsService) {
   };
 }]);
 
+
+var hljsDir, languageDirFactory, sourceDirFactory, includeDirFactory;
+
 /**
  * hljs directive
  */
-dirHljs = ['$compile', '$parse', function ($compile, $parse) {
+hljsDir = ['$compile', '$parse', function ($compile, $parse) {
   return {
     restrict: 'EA',
     controller: 'HljsCtrl',
@@ -205,7 +206,7 @@ dirHljs = ['$compile', '$parse', function ($compile, $parse) {
 /**
  * language directive
  */
-dirLanguageFactory = function (dirName) {
+languageDirFactory = function (dirName) {
   return [function () {
     return {
       require: '?hljs',
@@ -227,7 +228,7 @@ dirLanguageFactory = function (dirName) {
 /**
  * source directive
  */
-dirSourceFactory = function (dirName) {
+sourceDirFactory = function (dirName) {
   return ['$compile', '$parse', function ($compile, $parse) {
     return {
       require: '?hljs',
@@ -267,7 +268,7 @@ dirSourceFactory = function (dirName) {
 /**
  * include directive
  */
-dirIncludeFactory = function (dirName) {
+includeDirFactory = function (dirName) {
   return [
              '$http', '$templateCache', '$q', '$compile', '$parse',
     function ($http,   $templateCache,   $q,   $compile,   $parse) {
@@ -356,10 +357,11 @@ dirIncludeFactory = function (dirName) {
   }];
 };
 
-module
-.directive('hljs', dirHljs)
-.directive('language', dirLanguageFactory('language'))
-.directive('source', dirSourceFactory('source'))
-.directive('include', dirIncludeFactory('include'));
-
-})(angular.module('hljs', []));
+/**
+ * Add directives
+ */
+ngModule
+.directive('hljs', hljsDir)
+.directive('language', languageDirFactory('language'))
+.directive('source', sourceDirFactory('source'))
+.directive('include', includeDirFactory('include'));