add translate-child-key-into option to translate-child directive

Author: llwt

bower.json

@@ -3,7 +3,7 @@
   "main": [
     "dist/angular-devtrw-translate.js"
     ],
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Provides translate-base and translate-child directives for angular-translate",
   "authors": [
     "Steven Nance <steven@devtrw.com>"

dist/angular-devtrw-translate.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-devtrw-translate",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "author": "Steven Nance <steven@devtrw.com>",
   "homepage": "https://github.com/devtrw/angular-devtrw-translate",
   "repository": {

dist/angular-devtrw-translate.min.js

@@ -1,17 +1,6 @@
 /*@ngInject*/
 function dtrwTranslateChildDirective($compile, $translate) {
 
-  function rebuildElement(element, translateKey, translateInto, translateValues) {
-    if (translateInto) {
-      element.attr(translateInto, $translate.instant(translateKey, translateValues));
-      element.removeAttr('translate-child-into'); //remove the attribute to avoid indefinite loop
-    } else {
-      element.attr('translate', translateKey);
-    }
-
-    element.removeAttr('translate-child'); //remove the attribute to avoid indefinite loop
-  }
-
   return {
     restrict: 'A',
     replace:  false,
@@ -20,16 +9,24 @@ function dtrwTranslateChildDirective($compile, $translate) {
     require: '^translateBase',
     // Make sure this directive is run first
     priority: 1000,
-    link:     function link(scope, element, attrs, translateBaseCtrl) {
+    link:     function link(scope, element, attrs, translateBaseCtrl) { // jshint ignore:line
+      let {translateChildInto, translateChildKeyInto, translateValues} = attrs;
       let translateKey = translateBaseCtrl.getTranslationKey(attrs.translateChild);
-      let translateInto = attrs.translateChildInto;
-      let translateValues;
 
-      if (translateInto && attrs.translateValues) {
-        translateValues = scope.$eval(attrs.translateValues);
+      if (translateChildInto && translateChildKeyInto) {
+        throw new Error('translate-child-into and translate-child-key-into are mutually exclusive');
+      }
+
+      if (translateChildInto) {
+        translateValues = (translateValues) ? scope.$eval(translateValues) : {};
+        element.attr(translateChildInto, $translate.instant(translateKey, translateValues));
+      } else if (translateChildKeyInto) {
+        element.attr(translateChildKeyInto, translateKey);
+      } else {
+        element.attr('translate', translateKey);
       }
 
-      rebuildElement(element, translateKey, translateInto, translateValues);
+      element.removeAttr('translate-child'); //remove the attribute to avoid indefinite loop
 
       $compile(element)(scope);
     }