Merge pull request #18 from aurelia/attributes-fix

fix(attributes): allow omitting attributes in options
aurelia · Sep 21, 2015 · 01b64c6 · 01b64c6
2 parents ff9ce63 + 412d8c3
commit 01b64c6
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-i18n",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "A plugin that provides i18n support.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/index.js b/dist/amd/index.js
@@ -84,8 +84,13 @@ define(['exports', './i18n', 'aurelia-event-aggregator', 'aurelia-templating', '
     frameworkConfig.postTask(function () {
       var resources = frameworkConfig.container.get(_aureliaTemplating.ViewResources);
       var htmlBehaviorResource = resources.getAttribute('t');
+      var attributes = instance.i18next.options.attributes;
 
-      instance.i18next.options.attributes.forEach(function (alias) {
+      if (!attributes) {
+        attributes = ['t', 'i18n'];
+      }
+
+      attributes.forEach(function (alias) {
         return resources.registerAttribute(alias, htmlBehaviorResource, 't');
       });
     });

diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js
@@ -108,8 +108,13 @@ function configure(frameworkConfig, cb) {
   frameworkConfig.postTask(function () {
     var resources = frameworkConfig.container.get(_aureliaTemplating.ViewResources);
     var htmlBehaviorResource = resources.getAttribute('t');
+    var attributes = instance.i18next.options.attributes;
 
-    instance.i18next.options.attributes.forEach(function (alias) {
+    if (!attributes) {
+      attributes = ['t', 'i18n'];
+    }
+
+    attributes.forEach(function (alias) {
       return resources.registerAttribute(alias, htmlBehaviorResource, 't');
     });
   });

diff --git a/dist/es6/index.js b/dist/es6/index.js
@@ -31,8 +31,14 @@ export function configure(frameworkConfig, cb) {
   frameworkConfig.postTask(() => {
     let resources = frameworkConfig.container.get(ViewResources);
     let htmlBehaviorResource = resources.getAttribute('t');
+    let attributes = instance.i18next.options.attributes;
 
-    instance.i18next.options.attributes.forEach(alias => resources.registerAttribute(alias, htmlBehaviorResource, 't'));
+    // Register default attributes if none provided
+    if (!attributes) {
+      attributes = ['t', 'i18n'];
+    }
+
+    attributes.forEach(alias => resources.registerAttribute(alias, htmlBehaviorResource, 't'));
   });
 
   return ret;

diff --git a/dist/system/index.js b/dist/system/index.js
@@ -23,8 +23,13 @@ System.register(['./i18n', 'aurelia-event-aggregator', 'aurelia-templating', './
     frameworkConfig.postTask(function () {
       var resources = frameworkConfig.container.get(ViewResources);
       var htmlBehaviorResource = resources.getAttribute('t');
+      var attributes = instance.i18next.options.attributes;
 
-      instance.i18next.options.attributes.forEach(function (alias) {
+      if (!attributes) {
+        attributes = ['t', 'i18n'];
+      }
+
+      attributes.forEach(function (alias) {
         return resources.registerAttribute(alias, htmlBehaviorResource, 't');
       });
     });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-i18n",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "A plugin that provides i18n support.",
   "keywords": [
     "aurelia",

diff --git a/src/index.js b/src/index.js
@@ -31,8 +31,14 @@ export function configure(frameworkConfig, cb) {
   frameworkConfig.postTask(() => {
     let resources = frameworkConfig.container.get(ViewResources);
     let htmlBehaviorResource = resources.getAttribute('t');
+    let attributes = instance.i18next.options.attributes;
 
-    instance.i18next.options.attributes.forEach(alias => resources.registerAttribute(alias, htmlBehaviorResource, 't'));
+    // Register default attributes if none provided
+    if (!attributes) {
+      attributes = ['t', 'i18n'];
+    }
+
+    attributes.forEach(alias => resources.registerAttribute(alias, htmlBehaviorResource, 't'));
   });
 
   return ret;