Merge branch 'release/0.4.3'

pc035860 · pc035860 · commit bb934eb2e49b · 2015-07-28T02:03:31.000+08:00
diff --git a/angular-highlightjs.js b/angular-highlightjs.js
@@ -1,5 +1,5 @@
 /*! angular-highlightjs
-version: 0.4.2
+version: 0.4.3
 build date: 2015-07-28
 author: Chih-Hsuan Fan
 https://github.com/pc035860/angular-highlightjs.git */
@@ -44,6 +44,7 @@ ngModule.provider('hljsService', function () {
       return angular.copy(_hljsOptions);
     },
     $get: function () {
+      (hljs.configure || angular.noop)(_hljsOptions);
       return hljs;
     }
   };
diff --git a/angular-highlightjs.min.js b/angular-highlightjs.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-highlightjs",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "AngularJS directive for syntax highlighting with highlight.js.",
   "main": "./build/angular-highlightjs.js",
   "ignore": [
diff --git a/build/angular-highlightjs.js b/build/angular-highlightjs.js
@@ -1,5 +1,5 @@
 /*! angular-highlightjs
-version: 0.4.2
+version: 0.4.3
 build date: 2015-07-28
 author: Chih-Hsuan Fan
 https://github.com/pc035860/angular-highlightjs.git */
@@ -44,6 +44,7 @@ ngModule.provider('hljsService', function () {
       return angular.copy(_hljsOptions);
     },
     $get: function () {
+      (hljs.configure || angular.noop)(_hljsOptions);
       return hljs;
     }
   };
diff --git a/build/angular-highlightjs.min.js b/build/angular-highlightjs.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-highlightjs",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "AngularJS directive for syntax highlighting with highlight.js",
   "main": "./build/angular-highlightjs.js",
   "directories": {},
diff --git a/src/angular-highlightjs.js b/src/angular-highlightjs.js
@@ -28,6 +28,7 @@ ngModule.provider('hljsService', function () {
       return angular.copy(_hljsOptions);
     },
     $get: function () {
+      (hljs.configure || angular.noop)(_hljsOptions);
       return hljs;
     }
   };

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-highlightjs",`
`3`		`- "version": "0.4.2",`
	`3`	`+ "version": "0.4.3",`
`4`	`4`	`"description": "AngularJS directive for syntax highlighting with highlight.js.",`
`5`	`5`	`"main": "./build/angular-highlightjs.js",`
`6`	`6`	`"ignore": [`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ ngModule.provider('hljsService', function () {`
`28`	`28`	`return angular.copy(_hljsOptions);`
`29`	`29`	`},`
`30`	`30`	`$get: function () {`
	`31`	`+ (hljs.configure \|\| angular.noop)(_hljsOptions);`
`31`	`32`	`return hljs;`
`32`	`33`	`}`
`33`	`34`	`};`