diff --git a/.gitignore b/.gitignore index 4d6b8e2..92dd140 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,6 @@ build/Release # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git node_modules -temp \ No newline at end of file +temp + +bower_components \ No newline at end of file diff --git a/README.md b/README.md index 9a998da..8928101 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,8 @@ function MyCtrl($scope, prompt) { input: true, label: 'Name', value: 'Current name', - values: ['other','possible','names'] + values: ['other','possible','names'], + placeholder: 'Placeholder' }).then(function(name){ //the promise is resolved with the user input }); @@ -84,6 +85,11 @@ function MyCtrl($scope, prompt) { Default: `undefined` A list of values available in a dropdown for the user to select as the input value. + - #### options.placeholder + Type: `String` + Default: `''` + The placeholder of the input if `input=true`. + - #### options.buttons Type: `Array` of `Object` with properties `label`,`cancel`, `style`, and `primary` Default: `[{ label:'OK', primary: true }, { label:'Cancel', cancel: true }]` diff --git a/angular-prompt.html b/angular-prompt.html index 6cd0ef9..a95e030 100644 --- a/angular-prompt.html +++ b/angular-prompt.html @@ -12,9 +12,9 @@
- +
- +
diff --git a/angular-prompt.js b/angular-prompt.js index d67508c..e70e27b 100644 --- a/angular-prompt.js +++ b/angular-prompt.js @@ -10,6 +10,7 @@ angular.module('cgPrompt').factory('prompt',['$uibModal','$q',function($uibModal input: false, label: '', value: '', + placeholder: '', values: false, buttons: [ {label:'Cancel',cancel:true}, diff --git a/bower.json b/bower.json index 54dd4af..b3dc6ac 100644 --- a/bower.json +++ b/bower.json @@ -6,8 +6,8 @@ "dist/angular-prompt.js" ], "dependencies": { - "angular": "~1.5", - "angular-bootstrap": "~1.3" + "angular": "~1.6", + "angular-bootstrap": "~2.3" }, "ignore": [ "**/.*", @@ -24,6 +24,6 @@ "README.md" ], "devDependencies": { - "underscore": "~1.6.0" + "underscore": "~1.8.3" } } diff --git a/demo/demo.js b/demo/demo.js index 526e13f..22d4468 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -9,6 +9,7 @@ angular.module('app').controller('DemoCtrl',function($scope,prompt){ label:'Input label', value:'Input initial value', values:'', + placeholder:'Your input here ...', buttons:'' }; @@ -37,6 +38,7 @@ angular.module('app').controller('DemoCtrl',function($scope,prompt){ options.value = undefined; options.values = undefined; options.label = undefined; + options.placeholder = undefined; } return options; }; diff --git a/demo/index.html b/demo/index.html index 8470d72..ea58528 100644 --- a/demo/index.html +++ b/demo/index.html @@ -70,6 +70,12 @@

Options

+
+ +
+ +
+
diff --git a/dist/angular-prompt.js b/dist/angular-prompt.js index d03b37a..787b49f 100644 --- a/dist/angular-prompt.js +++ b/dist/angular-prompt.js @@ -10,6 +10,7 @@ angular.module('cgPrompt').factory('prompt',['$uibModal','$q',function($uibModal input: false, label: '', value: '', + placeholder: '', values: false, buttons: [ {label:'Cancel',cancel:true}, @@ -120,9 +121,9 @@ angular.module('cgPrompt').run(['$templateCache', function($templateCache) { " \n" + "
\n" + " \n" + - " \n" + + " \n" + "
\n" + - " \n" + + " \n" + "\n" + "
\n" + " \n" + diff --git a/dist/angular-prompt.min.js b/dist/angular-prompt.min.js index 168f726..e8a23fa 100644 --- a/dist/angular-prompt.min.js +++ b/dist/angular-prompt.min.js @@ -1 +1 @@ -angular.module("cgPrompt",["ui.bootstrap"]),angular.module("cgPrompt").factory("prompt",["$uibModal","$q",function(a,b){var c=function(c){var d={title:"",message:"",input:!1,label:"",value:"",values:!1,buttons:[{label:"Cancel",cancel:!0},{label:"OK",primary:!0}]};void 0===c&&(c={});for(var e in d)void 0===c[e]&&(c[e]=d[e]);var f=b.defer();return a.open({templateUrl:"angular-prompt.html",controller:"cgPromptCtrl",resolve:{options:function(){return c}}}).result.then(function(a){c.input?f.resolve(a.input):f.resolve(a.button)},function(){f.reject()}),f.promise};return c}]),angular.module("cgPrompt").controller("cgPromptCtrl",["$scope","options","$timeout",function(a,b,c){a.input={name:b.value},a.options=b,a.form={},a.buttonClicked=function(c){return c.cancel?void a.$dismiss():b.input&&a.form.cgPromptForm.$invalid?void(a.changed=!0):void a.$close({button:c,input:a.input.name})},a.submit=function(){var b;angular.forEach(a.options.buttons,function(a){a.primary&&(b=a)}),b&&a.buttonClicked(b)},c(function(){var a=document.querySelector("#cgPromptInput");a&&(a.select&&a.select(),a.focus&&a.focus())},100)}]),angular.module("cgPrompt").run(["$templateCache",function(a){"use strict";a.put("angular-prompt.html",'
\n \n \n \n
')}]); \ No newline at end of file +angular.module("cgPrompt",["ui.bootstrap"]),angular.module("cgPrompt").factory("prompt",["$uibModal","$q",function(a,b){var c=function(c){var d={title:"",message:"",input:!1,label:"",value:"",placeholder:"",values:!1,buttons:[{label:"Cancel",cancel:!0},{label:"OK",primary:!0}]};void 0===c&&(c={});for(var e in d)void 0===c[e]&&(c[e]=d[e]);var f=b.defer();return a.open({templateUrl:"angular-prompt.html",controller:"cgPromptCtrl",resolve:{options:function(){return c}}}).result.then(function(a){c.input?f.resolve(a.input):f.resolve(a.button)},function(){f.reject()}),f.promise};return c}]),angular.module("cgPrompt").controller("cgPromptCtrl",["$scope","options","$timeout",function(a,b,c){a.input={name:b.value},a.options=b,a.form={},a.buttonClicked=function(c){return c.cancel?void a.$dismiss():b.input&&a.form.cgPromptForm.$invalid?void(a.changed=!0):void a.$close({button:c,input:a.input.name})},a.submit=function(){var b;angular.forEach(a.options.buttons,function(a){a.primary&&(b=a)}),b&&a.buttonClicked(b)},c(function(){var a=document.querySelector("#cgPromptInput");a&&(a.select&&a.select(),a.focus&&a.focus())},100)}]),angular.module("cgPrompt").run(["$templateCache",function(a){"use strict";a.put("angular-prompt.html",'
\n \n \n \n
')}]); \ No newline at end of file diff --git a/package.json b/package.json index c5bc069..9884b8b 100644 --- a/package.json +++ b/package.json @@ -7,15 +7,15 @@ "url": "git://github.com/cgross/angular-prompt.git" }, "devDependencies": { - "grunt": "~0.4.4", - "grunt-contrib-uglify": "~0.4.0", - "grunt-contrib-jshint": "~0.10.0", - "grunt-contrib-jasmine": "~0.6.3", - "grunt-contrib-concat": "~0.4.0", - "grunt-angular-templates": "~0.5.4", - "grunt-contrib-connect": "~0.7.1", - "grunt-contrib-watch": "~0.6.1", - "load-grunt-tasks": "~0.4.0" + "grunt": "~1.0.1", + "grunt-contrib-uglify": "~2.0.0", + "grunt-contrib-jshint": "~1.1.0", + "grunt-contrib-jasmine": "~1.0.3", + "grunt-contrib-concat": "~1.0.1", + "grunt-angular-templates": "~1.1.0", + "grunt-contrib-connect": "~1.0.2", + "grunt-contrib-watch": "~1.0.0", + "load-grunt-tasks": "~3.5.2" }, "scripts": { "test": "grunt test -v"