Merge branch 'release/0.1.33'

drive · Sep 11, 2015 · 71ffde0 · 71ffde0
2 parents 7570e2c + fe1fff7
commit 71ffde0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/dist/amd/autocomplete-widget.js b/dist/amd/autocomplete-widget.js
@@ -68,8 +68,12 @@ define(['exports', 'aurelia-framework', 'jquery', 'devbridge/jQuery-Autocomplete
     }]);
 
     var _AutoCompleteWidget = AutoCompleteWidget;
-    AutoCompleteWidget = (0, _aureliaFramework.bindable)('placeholder')(AutoCompleteWidget) || AutoCompleteWidget;
     AutoCompleteWidget = (0, _aureliaFramework.bindable)('title')(AutoCompleteWidget) || AutoCompleteWidget;
+    AutoCompleteWidget = (0, _aureliaFramework.bindable)({
+      name: 'placeholder',
+      attribute: 'placeholder',
+      defaultValue: ''
+    })(AutoCompleteWidget) || AutoCompleteWidget;
     AutoCompleteWidget = (0, _aureliaFramework.bindable)({
       name: 'displayedText',
       attribute: 'displayed-text',

diff --git a/dist/commonjs/autocomplete-widget.js b/dist/commonjs/autocomplete-widget.js
@@ -73,8 +73,12 @@ var AutoCompleteWidget = (function () {
   }]);
 
   var _AutoCompleteWidget = AutoCompleteWidget;
-  AutoCompleteWidget = (0, _aureliaFramework.bindable)('placeholder')(AutoCompleteWidget) || AutoCompleteWidget;
   AutoCompleteWidget = (0, _aureliaFramework.bindable)('title')(AutoCompleteWidget) || AutoCompleteWidget;
+  AutoCompleteWidget = (0, _aureliaFramework.bindable)({
+    name: 'placeholder',
+    attribute: 'placeholder',
+    defaultValue: ''
+  })(AutoCompleteWidget) || AutoCompleteWidget;
   AutoCompleteWidget = (0, _aureliaFramework.bindable)({
     name: 'displayedText',
     attribute: 'displayed-text',

diff --git a/dist/es6/autocomplete-widget.js b/dist/es6/autocomplete-widget.js
@@ -19,8 +19,12 @@ import autocomplete from 'devbridge/jQuery-Autocomplete';
   attribute:'displayed-text',
   defaultBindingMode: bindingMode.twoWay
 })
+@bindable({
+  name: 'placeholder',
+  attribute: 'placeholder',
+  defaultValue: ''
+})
 @bindable('title')
-@bindable('placeholder')
 export class AutoCompleteWidget {
   constructor(element) {
     this.element = element;

diff --git a/dist/system/autocomplete-widget.js b/dist/system/autocomplete-widget.js
@@ -72,8 +72,12 @@ System.register(['aurelia-framework', 'jquery', 'devbridge/jQuery-Autocomplete']
         }]);
 
         var _AutoCompleteWidget = AutoCompleteWidget;
-        AutoCompleteWidget = bindable('placeholder')(AutoCompleteWidget) || AutoCompleteWidget;
         AutoCompleteWidget = bindable('title')(AutoCompleteWidget) || AutoCompleteWidget;
+        AutoCompleteWidget = bindable({
+          name: 'placeholder',
+          attribute: 'placeholder',
+          defaultValue: ''
+        })(AutoCompleteWidget) || AutoCompleteWidget;
         AutoCompleteWidget = bindable({
           name: 'displayedText',
           attribute: 'displayed-text',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-widgets",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "Collection of third party wrappers that get used in Aurelia applications",
   "homepage": "http://drivesoftware.co.nz",
   "main": "index",

diff --git a/src/autocomplete-widget.js b/src/autocomplete-widget.js
@@ -19,8 +19,12 @@ import autocomplete from 'devbridge/jQuery-Autocomplete';
   attribute:'displayed-text',
   defaultBindingMode: bindingMode.twoWay
 })
+@bindable({
+  name: 'placeholder',
+  attribute: 'placeholder',
+  defaultValue: ''
+})
 @bindable('title')
-@bindable('placeholder')
 export class AutoCompleteWidget {
   constructor(element) {
     this.element = element;