Merge branch 'feature/fix-63'

Author: pc035860

angular-highlightjs.js

@@ -1,6 +1,6 @@
 /*! angular-highlightjs
 version: 0.6.0
-build date: 2016-03-20
+build date: 2016-04-02
 author: Chih-Hsuan Fan
 https://github.com/pc035860/angular-highlightjs.git */
 
@@ -16,6 +16,37 @@ https://github.com/pc035860/angular-highlightjs.git */
 
 /*global angular, hljs*/
 
+/**
+ * returns a function to transform attrs to supported ones
+ *
+ * escape:
+ *   hljs-escape or escape
+ * no-escape:
+ *   hljs-no-escape or no-escape
+ * onhighlight:
+ *   hljs-onhighlight or onhighlight
+ */
+function attrGetter(attrs) {
+  return function (name) {
+    switch (name) {
+      case 'escape':
+        return angular.isDefined(attrs.hljsEscape) ?
+          attrs.hljsEscape :
+          attrs.escape;
+
+      case 'no-escape':
+        return angular.isDefined(attrs.hljsNoEscape) ?
+          attrs.hljsNoEscape :
+          attrs.noEscape;
+
+      case 'onhighlight':
+        return angular.isDefined(attrs.hljsOnhighlight) ?
+          attrs.hljsOnhighlight :
+          attrs.onhighlight;
+    }
+  };
+}
+
 function shouldHighlightStatics(attrs) {
   var should = true;
   angular.forEach([
@@ -273,17 +304,19 @@ hljsDir = /*@ngInject*/ ["$parse", function ($parse) {
       return function postLink(scope, iElm, iAttrs, ctrl) {
         var escapeCheck;
 
-        if (angular.isDefined(iAttrs.escape)) {
-          escapeCheck = $parse(iAttrs.escape);
-        } else if (angular.isDefined(iAttrs.noEscape)) {
+        var attrs = attrGetter(iAttrs);
+
+        if (angular.isDefined(attrs('escape'))) {
+          escapeCheck = $parse(attrs('escape'));
+        } else if (angular.isDefined(attrs('no-escape'))) {
           escapeCheck = $parse('false');
         }
 
         ctrl.init(iElm.find('code'));
 
-        if (iAttrs.onhighlight) {
+        if (attrs('onhighlight')) {
           ctrl.highlightCallback(function () {
-            scope.$eval(iAttrs.onhighlight);
+            scope.$eval(attrs('onhighlight'));
           });
         }
 

angular-highlightjs.min.js

@@ -1,6 +1,6 @@
 /*! angular-highlightjs
 version: 0.6.0
-build date: 2016-03-20
+build date: 2016-04-02
 author: Chih-Hsuan Fan
 https://github.com/pc035860/angular-highlightjs.git */
 
@@ -16,6 +16,37 @@ https://github.com/pc035860/angular-highlightjs.git */
 
 /*global angular, hljs*/
 
+/**
+ * returns a function to transform attrs to supported ones
+ *
+ * escape:
+ *   hljs-escape or escape
+ * no-escape:
+ *   hljs-no-escape or no-escape
+ * onhighlight:
+ *   hljs-onhighlight or onhighlight
+ */
+function attrGetter(attrs) {
+  return function (name) {
+    switch (name) {
+      case 'escape':
+        return angular.isDefined(attrs.hljsEscape) ?
+          attrs.hljsEscape :
+          attrs.escape;
+
+      case 'no-escape':
+        return angular.isDefined(attrs.hljsNoEscape) ?
+          attrs.hljsNoEscape :
+          attrs.noEscape;
+
+      case 'onhighlight':
+        return angular.isDefined(attrs.hljsOnhighlight) ?
+          attrs.hljsOnhighlight :
+          attrs.onhighlight;
+    }
+  };
+}
+
 function shouldHighlightStatics(attrs) {
   var should = true;
   angular.forEach([
@@ -273,17 +304,19 @@ hljsDir = /*@ngInject*/ ["$parse", function ($parse) {
       return function postLink(scope, iElm, iAttrs, ctrl) {
         var escapeCheck;
 
-        if (angular.isDefined(iAttrs.escape)) {
-          escapeCheck = $parse(iAttrs.escape);
-        } else if (angular.isDefined(iAttrs.noEscape)) {
+        var attrs = attrGetter(iAttrs);
+
+        if (angular.isDefined(attrs('escape'))) {
+          escapeCheck = $parse(attrs('escape'));
+        } else if (angular.isDefined(attrs('no-escape'))) {
           escapeCheck = $parse('false');
         }
 
         ctrl.init(iElm.find('code'));
 
-        if (iAttrs.onhighlight) {
+        if (attrs('onhighlight')) {
           ctrl.highlightCallback(function () {
-            scope.$eval(iAttrs.onhighlight);
+            scope.$eval(attrs('onhighlight'));
           });
         }