Skip to content

Commit

Permalink
Merge branch 'release/release_for_0.1.14'
Browse files Browse the repository at this point in the history
  • Loading branch information
codelabnz committed Apr 21, 2015
2 parents 49879cf + 94466bc commit ba5096f
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 14 deletions.
5 changes: 5 additions & 0 deletions dist/amd/lookup-abstract.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ define(['exports'], function (exports) {
value: function formatSelection(item) {
return item.code;
}
}, {
key: 'id',
value: function id(item) {
return item.id;
}
}]);

return LookupAbstract;
Expand Down
4 changes: 2 additions & 2 deletions dist/amd/lookup-widget.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>

<label for="lookupField">${title}</label>
<input type="text" class="form-control" id="lookupField">
<label for="lookupField" class="control-label" show.bind="title.length > 0">${title}</label>
<input type="text" id="lookupField">

</template>
1 change: 1 addition & 0 deletions dist/amd/lookup-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ define(['exports', 'aurelia-framework', 'jquery', 'select2'], function (exports,
initSelection: function initSelection(element, callback) {
callback(self.controller.setDefaultSelection());
},
id: self.controller.id,
placeholder: _this.placeholder,
formatSelection: self.controller.formatSelection,
formatResult: self.controller.formatItem,
Expand Down
5 changes: 5 additions & 0 deletions dist/commonjs/lookup-abstract.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ var LookupAbstract = (function () {
value: function formatSelection(item) {
return item.code;
}
}, {
key: 'id',
value: function id(item) {
return item.id;
}
}]);

return LookupAbstract;
Expand Down
4 changes: 2 additions & 2 deletions dist/commonjs/lookup-widget.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>

<label for="lookupField">${title}</label>
<input type="text" class="form-control" id="lookupField">
<label for="lookupField" class="control-label" show.bind="title.length > 0">${title}</label>
<input type="text" id="lookupField">

</template>
1 change: 1 addition & 0 deletions dist/commonjs/lookup-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ var LookupWidget = (function () {
initSelection: function initSelection(element, callback) {
callback(self.controller.setDefaultSelection());
},
id: self.controller.id,
placeholder: _this.placeholder,
formatSelection: self.controller.formatSelection,
formatResult: self.controller.formatItem,
Expand Down
4 changes: 4 additions & 0 deletions dist/es6/lookup-abstract.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,8 @@ export class LookupAbstract {
formatSelection(item) {
return item.code;
}

id(item) {
return item.id;
}
}
4 changes: 2 additions & 2 deletions dist/es6/lookup-widget.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>

<label for="lookupField">${title}</label>
<input type="text" class="form-control" id="lookupField">
<label for="lookupField" class="control-label" show.bind="title.length > 0">${title}</label>
<input type="text" id="lookupField">

</template>
1 change: 1 addition & 0 deletions dist/es6/lookup-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class LookupWidget {
initSelection: function(element, callback) {
callback(self.controller.setDefaultSelection());
},
id: self.controller.id,
placeholder: this.placeholder,
formatSelection: self.controller.formatSelection,
formatResult: self.controller.formatItem,
Expand Down
5 changes: 5 additions & 0 deletions dist/system/lookup-abstract.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ System.register([], function (_export) {
value: function formatSelection(item) {
return item.code;
}
}, {
key: 'id',
value: function id(item) {
return item.id;
}
}]);

return LookupAbstract;
Expand Down
4 changes: 2 additions & 2 deletions dist/system/lookup-widget.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>

<label for="lookupField">${title}</label>
<input type="text" class="form-control" id="lookupField">
<label for="lookupField" class="control-label" show.bind="title.length > 0">${title}</label>
<input type="text" id="lookupField">

</template>
1 change: 1 addition & 0 deletions dist/system/lookup-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ System.register(['aurelia-framework', 'jquery', 'select2'], function (_export) {
initSelection: function initSelection(element, callback) {
callback(self.controller.setDefaultSelection());
},
id: self.controller.id,
placeholder: _this.placeholder,
formatSelection: self.controller.formatSelection,
formatResult: self.controller.formatItem,
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
"lib": "dist/system"
},
"dependencies": {
"aurelia-dependency-injection": "^0.6.0",
"aurelia-framework": "^0.10.0",
"css": "^0.1.6",
"jquery": "^2.1.3",
"aurelia-dependency-injection": "github:aurelia/dependency-injection@^0.6.0",
"aurelia-framework": "github:aurelia/framework@^0.10.0",
"css": "github:systemjs/plugin-css@^0.1.6",
"jquery": "github:components/jquery@^2.1.3",
"select2": "github:select2/select2@^3.5.2"
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/lookup-abstract.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,8 @@ export class LookupAbstract {
formatSelection(item) {
return item.code;
}

id(item) {
return item.id;
}
}
4 changes: 2 additions & 2 deletions src/lookup-widget.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>

<label for="lookupField">${title}</label>
<input type="text" class="form-control" id="lookupField">
<label for="lookupField" class="control-label" show.bind="title.length > 0">${title}</label>
<input type="text" id="lookupField">

</template>
1 change: 1 addition & 0 deletions src/lookup-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class LookupWidget {
initSelection: function(element, callback) {
callback(self.controller.setDefaultSelection());
},
id: self.controller.id,
placeholder: this.placeholder,
formatSelection: self.controller.formatSelection,
formatResult: self.controller.formatItem,
Expand Down

0 comments on commit ba5096f

Please sign in to comment.