Skip to content

Commit

Permalink
fixes #1
Browse files Browse the repository at this point in the history
  • Loading branch information
cgross committed Apr 12, 2015
1 parent 6992a51 commit 6de8bdf
Show file tree
Hide file tree
Showing 12 changed files with 443 additions and 232 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = function (grunt) {
spawn: false
},
files: ['angular-prompt.html','angular-prompt.js','dist/**/*','demo/**/*'],
tasks: ['jshint']
tasks: ['build']
}
},
jshint: {
Expand Down
4 changes: 2 additions & 2 deletions angular-prompt.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ <h4 class="modal-title">{{options.title}}</h4>
<div class="input-group" ng-if="options.values">
<input id="cgPromptInput" type="text" class="form-control" placeholder="{{options.label}}" ng-model="input.name" required ng-change="changed=true" autofocus="autofocus"/>

<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<div class="input-group-btn" dropdown>
<button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle data-toggle="dropdown"><span class="caret"></span></button>
<ul class="dropdown-menu pull-right">
<li ng-repeat="value in options.values"><a href="" ng-click="input.name = value">{{value}}</a></li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "angular-prompt",
"description": "Angular service to easily display prompt and confirmation modals.",
"version": "1.1.0",
"version": "1.1.1",
"main": [
"dist/angular-prompt.js"
],
"dependencies": {
"angular": "~1.2.16",
"angular-bootstrap": "~0.11.0"
"angular-bootstrap": "~0.12.0"
},
"ignore": [
"**/.*",
Expand Down
23 changes: 15 additions & 8 deletions bower_components/angular-bootstrap/.bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,29 @@
"name": "https://github.com/angular-ui/bootstrap/graphs/contributors"
},
"name": "angular-bootstrap",
"version": "0.11.0",
"keywords": [
"angular",
"angular-ui",
"bootstrap"
],
"license": "MIT",
"ignore": [],
"description": "Native AngularJS (Angular) directives for Bootstrap.",
"version": "0.12.1",
"main": [
"./ui-bootstrap-tpls.js"
],
"dependencies": {
"angular": ">=1"
"angular": ">=1 <1.3.0"
},
"homepage": "https://github.com/angular-ui/bootstrap-bower",
"_release": "0.11.0",
"_release": "0.12.1",
"_resolution": {
"type": "version",
"tag": "0.11.0",
"commit": "75b302f82c1a3b0647695a3dfeacab0a153ea8a0"
"tag": "0.12.1",
"commit": "ab14fbaaf3d592f8e76018f0666c5af6f68ebaa3"
},
"_source": "git://github.com/angular-ui/bootstrap-bower.git",
"_target": "~0.11.0",
"_originalSource": "angular-bootstrap",
"_direct": true
"_target": "~0.12.0",
"_originalSource": "angular-bootstrap"
}
12 changes: 10 additions & 2 deletions bower_components/angular-bootstrap/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,17 @@
"name": "https://github.com/angular-ui/bootstrap/graphs/contributors"
},
"name": "angular-bootstrap",
"version": "0.11.0",
"keywords": [
"angular",
"angular-ui",
"bootstrap"
],
"license": "MIT",
"ignore": [],
"description": "Native AngularJS (Angular) directives for Bootstrap.",
"version": "0.12.1",
"main": ["./ui-bootstrap-tpls.js"],
"dependencies": {
"angular": ">=1"
"angular": ">=1 <1.3.0"
}
}
Loading

0 comments on commit 6de8bdf

Please sign in to comment.