rewrite translate-child and replace attirbutes with translate format

`translate-child-into` and `translate-child-key-into` have been removed.
To translate into an attribute you now specify it before the translation
key in the `translate-child` attribute as so:
````
<a translate-child="(aria-label,title,!translate)=SOME_TRANSLATION.KEY"></a>
````

The attributes should be comma delimited and prefixed with a `!` when you
want the translation key to be set instead of the translated value.

Author: llwt

bower.json

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

demo/index.html

@@ -61,15 +61,15 @@ <h3>Examples</h3>
        class="page"
        ng-init="lastLoginUsername = 'someUserName'">
     <div class="example">
-      <h4>translate-values</h4>
+      <h4>translate child using `translate-values`</h4>
       <hr>
       <div translate-base="LAST_LOGIN">
         <p translate-child="DETAILS" translate-values="{username: lastLoginUsername}"></p>
       </div>
     </div>
 
     <div class="example">
-      <h4>translate-child-into</h4>
+      <h4>translate child into attribute</h4>
       <hr>
       <div translate-base="PASSWORD_FORM">
         <h4 translate-child="TITLE"></h4>
@@ -78,24 +78,14 @@ <h4 translate-child="TITLE"></h4>
           <div class="form-group" translate-base="PASSWORD">
             <label translate-child="LABEL" for="password-input"></label>
             <input type="text" id="password-input"
-                   translate-child="PLACEHOLDER"
-                   translate-child-into="placeholder">
+                   translate-child="(placeholder)=PLACEHOLDER">
           </div>
         </form>
       </div>
     </div>
 
-    <div class="example" translate-base="GOOGLE_LINK">
-      <h4>translate-child-into <em>with multiple target attributes</em></h4>
-      <hr>
-      <a href="https://google.com"
-         translate-child="TEXT"
-         translate-child-into="title,arial-label"
-         translate-child-key-into="translate"></a>
-    </div>
-
     <div class="example">
-      <h4>translate-values <em>and</em> translate-child-into</h4>
+      <h4>translate child into attribute with translate-values</h4>
       <hr>
       <div translate-base="USERNAME_FORM">
         <h4 translate-child="TITLE"></h4>
@@ -105,16 +95,21 @@ <h4 translate-child="TITLE"></h4>
             <label translate-child="LABEL" for="username-input"></label>
             <input type="text"
                    id="username-input"
-                   translate-child="PLACEHOLDER"
-                   translate-values="{lastLoginUser: lastLoginUsername}"
-                   translate-child-into="placeholder">
+                   translate-child="(placeholder)=PLACEHOLDER"
+                   translate-values="{lastLoginUser: lastLoginUsername}">
           </div>
         </form>
       </div>
     </div>
 
+    <div class="example" translate-base="GOOGLE_LINK">
+      <h4>translate child key into attribute</h4>
+      <hr>
+      <a href="https://google.com" translate-child="(title,aria-label,!translate)=TEXT"></a>
+    </div>
+
     <div class="example">
-      <h4>translate-exclude-parent-base</h4>
+      <h4>exclude parent translate base</h4>
       <hr>
       <div translate-base="PASSWORD_FORM">
         <div translate-base="dtrw.translate.forms.ACTIONS"

dist/angular-devtrw-translate.js

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

dist/angular-devtrw-translate.min.js

@@ -1,5 +1,56 @@
 function dtrwTranslateChildDirective($compile, $translate) {
 
+  function setValueForAttrs(element, targetAttrs, value) {
+    targetAttrs.forEach((targetAttrs) => {
+      element.attr(targetAttrs, value);
+    });
+  }
+
+  function parseTranslateChildAttributes(configString) {
+    let keyAttributes = [];
+    let valueAttributes = [];
+    let attributes = configString
+      .replace(/[\[\]\(\)\s]+/g, '') // remove parenthesis, brackets, an spaces
+      .split(',');
+
+    attributes.forEach((attributeName) => {
+      // attribute names prefixed with ! signifies that the translation key should be
+      // set instead of the translated value
+      if ('!' === attributeName.charAt(0)) {
+        keyAttributes.push(attributeName.substr(1));
+      } else {
+        valueAttributes.push(attributeName);
+      }
+    });
+
+    return [keyAttributes, valueAttributes];
+  }
+
+  function parseTranslateChildAttr(attribute) {
+    console.log('parsing: ', attribute);
+    let parts = attribute.split('=');
+
+    // by default we just set the translation key on the `translate` attributes
+    if (1 === parts.length) {
+      return {
+        translateKey:    parts[0],
+        keyAttributes:   ['translate'],
+        valueAttributes: []
+      };
+    }
+
+    let parsedAttributes = parseTranslateChildAttributes(parts[0]);
+
+    let parsed = {
+      translateKey:    parts[1],
+      keyAttributes:   parsedAttributes[0],
+      valueAttributes: parsedAttributes[1]
+    };
+    console.log('parsed: ', parsed);
+
+    return parsed;
+  }
+
   return {
     restrict: 'A',
     replace:  false,
@@ -9,30 +60,27 @@ function dtrwTranslateChildDirective($compile, $translate) {
     // Make sure this directive is run first
     priority: 1000,
     link:     function link(scope, element, attrs, translateBaseCtrl) { // jshint ignore:line
-      let {translateChildInto, translateChildKeyInto, translateValues} = attrs;
-      let translateKey = translateBaseCtrl ?
-        translateBaseCtrl.getTranslationKey(attrs.translateChild) :
-        `COULD_NOT_FIND_TRANSLATE_BASE_CONTROLLER_FOR_CHILD-${attrs.translateChild}`;
-
-      function setValueForAttrs(targetAttrs, value) {
-        targetAttrs
-          .split(',')
-          .forEach((targetAttrs) => {
-            element.attr(targetAttrs, value);
-          });
-      }
+      let {
+        translateKey,
+        keyAttributes,
+        valueAttributes
+        } = parseTranslateChildAttr(attrs.translateChild);
 
-      if (translateChildInto) {
-        translateValues = (translateValues) ? scope.$eval(translateValues) : {};
-        setValueForAttrs(translateChildInto, $translate.instant(translateKey, translateValues));
-      }
+      translateKey = translateBaseCtrl ?
+        translateBaseCtrl.getTranslationKey(translateKey) :
+        `COULD_NOT_FIND_TRANSLATE_BASE_CONTROLLER_FOR_CHILD-${translateKey}`;
 
-      if (translateChildKeyInto) {
-        setValueForAttrs(translateChildKeyInto, translateKey);
+      if (0 < keyAttributes.length) {
+        setValueForAttrs(element, keyAttributes, translateKey);
       }
 
-      if (!translateChildInto && !translateChildKeyInto) {
-        element.attr('translate', translateKey);
+      if (0 < valueAttributes.length) {
+        let translateValues = (attrs.translateValues) ? scope.$eval(attrs.translateValues) : {};
+        setValueForAttrs(
+          element,
+          valueAttributes,
+          $translate.instant(translateKey, translateValues)
+        );
       }
 
       element.removeAttr('translate-child'); //remove the attribute to avoid indefinite loop