Skip to content

Commit

Permalink
add placeholder text
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Malone committed Aug 20, 2015
1 parent d55d95c commit 2e84686
Show file tree
Hide file tree
Showing 17 changed files with 15 additions and 21 deletions.
3 changes: 0 additions & 3 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ System.config({
"aurelia-templating-binding": "github:aurelia/templating-binding@0.14.0",
"aurelia-templating-resources": "github:aurelia/templating-resources@0.14.0",
"aurelia-templating-router": "github:aurelia/templating-router@0.15.0",
"aurelia/templating": "github:aurelia/templating@0.14.4",
"aurelia/templating-resources": "github:aurelia/templating-resources@0.14.0",
"aurelia/templating-router": "github:aurelia/templating-router@0.15.0",
"babel": "npm:babel-core@5.8.22",
"babel-runtime": "npm:babel-runtime@5.8.20",
"core-js": "npm:core-js@1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion dist/amd/autocomplete-widget.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="form-group">
<label class="control-label">${title}</label>
<input class="form-control" type="text" value.bind="displayedText" />
<input class="form-control" type="text" value.bind="displayedText" placeholder.bind="placeholder"/>
</div>
</template>

Expand Down
1 change: 1 addition & 0 deletions dist/amd/autocomplete-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ 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: 'displayedText',
Expand Down
3 changes: 1 addition & 2 deletions dist/amd/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ define(['exports'], function (exports) {
exports.configure = configure;

function configure(aurelia) {
aurelia.globalResources('./lookup-widget');
aurelia.globalResources('./autocomplete-widget');
aurelia.globalResources(['lookup-widget', 'autocomplete-widget']);
}
});
2 changes: 1 addition & 1 deletion dist/commonjs/autocomplete-widget.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="form-group">
<label class="control-label">${title}</label>
<input class="form-control" type="text" value.bind="displayedText" />
<input class="form-control" type="text" value.bind="displayedText" placeholder.bind="placeholder"/>
</div>
</template>

Expand Down
1 change: 1 addition & 0 deletions dist/commonjs/autocomplete-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ 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: 'displayedText',
Expand Down
3 changes: 1 addition & 2 deletions dist/commonjs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ Object.defineProperty(exports, '__esModule', {
exports.configure = configure;

function configure(aurelia) {
aurelia.globalResources('./lookup-widget');
aurelia.globalResources('./autocomplete-widget');
aurelia.globalResources(['lookup-widget', 'autocomplete-widget']);
}
2 changes: 1 addition & 1 deletion dist/es6/autocomplete-widget.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="form-group">
<label class="control-label">${title}</label>
<input class="form-control" type="text" value.bind="displayedText" />
<input class="form-control" type="text" value.bind="displayedText" placeholder.bind="placeholder"/>
</div>
</template>

Expand Down
1 change: 1 addition & 0 deletions dist/es6/autocomplete-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import autocomplete from 'devbridge/jQuery-Autocomplete';
defaultBindingMode: bindingMode.twoWay
})
@bindable('title')
@bindable('placeholder')
export class AutoCompleteWidget {
constructor(element) {
this.element = element;
Expand Down
3 changes: 1 addition & 2 deletions dist/es6/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export function configure(aurelia) {
aurelia.globalResources('./lookup-widget');
aurelia.globalResources('./autocomplete-widget');
aurelia.globalResources(['lookup-widget','autocomplete-widget']);
}
2 changes: 1 addition & 1 deletion dist/system/autocomplete-widget.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="form-group">
<label class="control-label">${title}</label>
<input class="form-control" type="text" value.bind="displayedText" />
<input class="form-control" type="text" value.bind="displayedText" placeholder.bind="placeholder"/>
</div>
</template>

Expand Down
1 change: 1 addition & 0 deletions dist/system/autocomplete-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ System.register(['aurelia-framework', 'jquery', 'devbridge/jQuery-Autocomplete']
}]);

var _AutoCompleteWidget = AutoCompleteWidget;
AutoCompleteWidget = bindable('placeholder')(AutoCompleteWidget) || AutoCompleteWidget;
AutoCompleteWidget = bindable('title')(AutoCompleteWidget) || AutoCompleteWidget;
AutoCompleteWidget = bindable({
name: 'displayedText',
Expand Down
3 changes: 1 addition & 2 deletions dist/system/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ System.register([], function (_export) {
_export('configure', configure);

function configure(aurelia) {
aurelia.globalResources('./lookup-widget');
aurelia.globalResources('./autocomplete-widget');
aurelia.globalResources(['lookup-widget', 'autocomplete-widget']);
}

return {
Expand Down
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@
"aurelia-templating-binding": "github:aurelia/templating-binding@^0.14.0",
"aurelia-templating-resources": "github:aurelia/templating-resources@^0.14.0",
"aurelia-templating-router": "github:aurelia/templating-router@^0.15.0",
"aurelia/templating": "github:aurelia/templating@^0.14.4",
"aurelia/templating-resources": "github:aurelia/templating-resources@^0.14.0",
"aurelia/templating-router": "github:aurelia/templating-router@^0.15.0",
"css": "github:systemjs/plugin-css@^0.1.6",
"devbridge/jQuery-Autocomplete": "github:devbridge/jQuery-Autocomplete@^1.2.21",
"jquery": "github:components/jquery@^2.1.3",
Expand Down
2 changes: 1 addition & 1 deletion src/autocomplete-widget.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="form-group">
<label class="control-label">${title}</label>
<input class="form-control" type="text" value.bind="displayedText" />
<input class="form-control" type="text" value.bind="displayedText" placeholder.bind="placeholder"/>
</div>
</template>

Expand Down
1 change: 1 addition & 0 deletions src/autocomplete-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import autocomplete from 'devbridge/jQuery-Autocomplete';
defaultBindingMode: bindingMode.twoWay
})
@bindable('title')
@bindable('placeholder')
export class AutoCompleteWidget {
constructor(element) {
this.element = element;
Expand Down
3 changes: 1 addition & 2 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export function configure(aurelia) {
aurelia.globalResources('./lookup-widget');
aurelia.globalResources('./autocomplete-widget');
aurelia.globalResources(['lookup-widget','autocomplete-widget']);
}

0 comments on commit 2e84686

Please sign in to comment.