Skip to content
This repository has been archived by the owner on May 29, 2019. It is now read-only.

feat(timepicker): Added ability to handle empty model #4615

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
202 changes: 202 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ Unfortunately we are not able to investigate / fix bugs without a minimal reprod

## You want to contribute some code?

**NOTE: We are migrating all our components to use a prefix, in the meantime you will see both the new and the old directives separated by a comment. If you want to contribute with code, make all your changes on top of that comment.**

We are always looking for the quality contributions and will be happy to accept your Pull Requests as long as those adhere to some basic rules:

* Please make sure that your contribution fits well in the project's context:
Expand Down
13 changes: 9 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function(grunt) {
grunt.util.linefeed = '\n';

grunt.initConfig({
ngversion: '1.4.3',
ngversion: '1.4.7',
bsversion: '3.1.1',
modules: [],//to be filled in by build task
pkg: grunt.file.readJSON('package.json'),
Expand Down Expand Up @@ -157,10 +157,15 @@ module.exports = function(grunt) {
reporters: ['progress', 'coverage']
}
},
changelog: {
conventionalChangelog: {
options: {
dest: 'CHANGELOG.md',
changelogOpts: {
preset: 'angular'
},
templateFile: 'misc/changelog.tpl.md'
},
release: {
src: 'CHANGELOG.md'
}
},
shell: {
Expand All @@ -169,7 +174,7 @@ module.exports = function(grunt) {
'release-prepare': [
'grunt before-test after-test',
'grunt version', //remove "-SNAPSHOT"
'grunt changelog'
'grunt conventionalChangelog'
],
'release-complete': [
'git commit CHANGELOG.md package.json -m "chore(release): v%version%"',
Expand Down
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
- [Manual](#manual-download)
- [Support](#support)
- [FAQ](#faq)
- [PREFIX MIGRATION GUIDE](#prefix-migration-guide)
- [Supported browsers](#supported-browsers)
- [Old Docs](#old-docs)
- [Need help?](#need-help)
- [Found a bug?](#found-a-bug)
- [Contributing to the project](#contributing-to-the-project)
Expand All @@ -30,6 +32,8 @@ Do you want to see directives in action? Visit http://angular-ui.github.io/boots
Installation is easy as UI Bootstrap has minimal dependencies - only the AngularJS and Twitter Bootstrap's CSS are required.
Note: Since version 0.13.0, UI Bootstrap depends on [ngAnimate](https://docs.angularjs.org/api/ngAnimate) for transitions and animations, such as the accordion, carousel, etc. Include `ngAnimate` in the module dependencies for your app in order to enable animation.

Additionally, it is srongly recommended that for UI Bootstrap 0.13.3 and higher you use Angular 1.3.18 or higher due to animation fixes.

#### Install with NPM

```sh
Expand Down Expand Up @@ -84,6 +88,10 @@ angular.module('myModule', [uibs]);

https://github.com/angular-ui/bootstrap/wiki/FAQ

## PREFIX MIGRATION GUIDE

If you're updating your application to use prefixes, please check the [migration guide](https://github.com/angular-ui/bootstrap/wiki/Migration-guide-for-prefixes).

## Supported browsers

Directives from this repository are automatically tested with the following browsers:
Expand All @@ -95,6 +103,9 @@ Directives from this repository are automatically tested with the following brow

Modern mobile browsers should work without problems.

## Old Docs

For the time being, we don't have versioned docs (we are open for a good PR to fix that). If you need to read the old doc, please check the [wiki](https://github.com/angular-ui/bootstrap/wiki/Reading-previous-version-docs).

## Need help?
Need help using UI Bootstrap?
Expand Down
1 change: 1 addition & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module.exports = function(config) {
'misc/test-lib/jquery-1.8.2.min.js',
'node_modules/angular/angular.js',
'node_modules/angular-mocks/angular-mocks.js',
'node_modules/angular-sanitize/angular-sanitize.js',
'misc/test-lib/helpers.js',
'src/**/*.js',
'template/**/*.js'
Expand Down
14 changes: 7 additions & 7 deletions misc/demo/assets/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* global FastClick, smoothScroll */
angular.module('ui.bootstrap.demo', ['ui.bootstrap', 'plunker', 'ngTouch', 'ngAnimate'], function($httpProvider){
angular.module('ui.bootstrap.demo', ['ui.bootstrap', 'plunker', 'ngTouch', 'ngAnimate', 'ngSanitize'], function($httpProvider){
FastClick.attach(document.body);
delete $httpProvider.defaults.headers.common['X-Requested-With'];
}).run(['$location', function($location){
Expand All @@ -20,7 +20,7 @@ angular.module('ui.bootstrap.demo', ['ui.bootstrap', 'plunker', 'ngTouch', 'ngAn
get: function () {
return $q.all({
moduleMap: getModuleMap(),
rawFiles: getRawFiles(),
rawFiles: getRawFiles()
});
}
};
Expand All @@ -46,9 +46,9 @@ angular.module('ui.bootstrap.demo', ['ui.bootstrap', 'plunker', 'ngTouch', 'ngAn
.controller('SelectModulesCtrl', SelectModulesCtrl)
.controller('DownloadCtrl', DownloadCtrl);

function MainCtrl($scope, $http, $document, $modal, orderByFilter) {
function MainCtrl($scope, $http, $document, $uibModal, orderByFilter) {
$scope.showBuildModal = function() {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
templateUrl: 'buildModal.html',
controller: 'SelectModulesCtrl',
resolve: {
Expand All @@ -63,7 +63,7 @@ function MainCtrl($scope, $http, $document, $modal, orderByFilter) {
};

$scope.showDownloadModal = function() {
var modalInstance = $modal.open({
var modalInstance = $uibModal.open({
templateUrl: 'downloadModal.html',
controller: 'DownloadCtrl'
});
Expand Down Expand Up @@ -285,7 +285,7 @@ var isOldBrowser;
* https://github.com/ssorallen/blob-feature-check/
* License: Public domain (http://unlicense.org)
*/
var url = window.webkitURL || window.URL; // Safari 6 uses "webkitURL".
var url = window.URL;
var svg = new Blob(
['<svg xmlns=\'http://www.w3.org/2000/svg\'></svg>'],
{ type: 'image/svg+xml;charset=utf-8' }
Expand All @@ -306,4 +306,4 @@ var isOldBrowser;
.attr('src', objectUrl);
}

})();
})();
29 changes: 15 additions & 14 deletions misc/demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<script src="//ajax.googleapis.com/ajax/libs/angularjs/<%= ngversion %>/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/<%= ngversion %>/angular-animate.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/<%= ngversion %>/angular-touch.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/<%= ngversion %>/angular-sanitize.js"></script>
<script src="ui-bootstrap-tpls-<%= pkg.version%>.min.js"></script>
<script src="assets/plunker.js"></script>
<script src="assets/app.js"></script>
Expand All @@ -40,8 +41,8 @@
<a href="#top" role="button" class="navbar-brand">
UI Bootstrap
</a>
<li class="dropdown" dropdown>
<a role="button" class="dropdown-toggle" dropdown-toggle>
<li class="dropdown" uib-dropdown>
<a role="button" class="dropdown-toggle" uib-dropdown-toggle>
Directives <b class="caret"></b>
</a>
<ul class="dropdown-menu">
Expand All @@ -51,7 +52,7 @@
<li><a href="#getting_started">Getting started</a></li>
</ul>
</nav>
<nav class="visible-xs" collapse="!isCollapsed">
<nav class="visible-xs" uib-collapse="!isCollapsed">
<ul class="nav navbar-nav">
<li><a href="#getting_started" ng-click="isCollapsed = !isCollapsed">Getting started</a></li>
<li><a href="#directives_small" ng-click="isCollapsed = !isCollapsed">Directives</a></li>
Expand Down Expand Up @@ -201,18 +202,18 @@ <h1><%= module.displayName %><small>
<div class="pull-right">
<button type="button" class="btn btn-info plunk-btn" ng-click="edit('<%= ngversion%>', '<%= bsversion %>', '<%= pkg.version%>', '<%= module.name %>')"><i class="glyphicon glyphicon-edit"></i> Edit in plunker</button>
</div>
<tabset>
<tab heading="Markup">
<uib-tabset>
<uib-tab heading="Markup">
<div plunker-content="markup">
<pre ng-non-bindable><code data-language="html"><%- module.docs.html %></code></pre>
</div>
</tab>
<tab heading="JavaScript">
</uib-tab>
<uib-tab heading="JavaScript">
<div plunker-content="javascript">
<pre ng-non-bindable><code data-language="javascript"><%- module.docs.js %></code></pre>
</div>
</tab>
</tabset>
</uib-tab>
</uib-tabset>
</div>
</div>
</section>
Expand Down Expand Up @@ -241,8 +242,8 @@ <h1><%= module.displayName %><small>
<label class="col-sm-3 control-label"><strong>Build</strong></label>
<div class="col-sm-9">
<span class="btn-group">
<button type="button" class="btn btn-default" ng-model="options.minified" btn-radio="true">Minified</button>
<button type="button" class="btn btn-default" ng-model="options.minified" btn-radio="false">Uncompressed</button>
<button type="button" class="btn btn-default" ng-model="options.minified" uib-btn-radio="true">Minified</button>
<button type="button" class="btn btn-default" ng-model="options.minified" uib-btn-radio="false">Uncompressed</button>
</span>
<small class="help-block">Use <b>Minified</b> version in your deployed application. <b>Uncompressed</b> source code is useful only for debugging and development purpose.</small>
</div>
Expand All @@ -251,8 +252,8 @@ <h1><%= module.displayName %><small>
<label class="col-sm-3 control-label"><strong>Include Templates</strong></label>
<div class="col-sm-9">
<span class="btn-group">
<button type="button" class="btn btn-default" ng-model="options.tpls" btn-radio="true">Yes</button>
<button type="button" class="btn btn-default" ng-model="options.tpls" btn-radio="false">No</button>
<button type="button" class="btn btn-default" ng-model="options.tpls" uib-btn-radio="true">Yes</button>
<button type="button" class="btn btn-default" ng-model="options.tpls" uib-btn-radio="false">No</button>
</span>
<small class="help-block">Whether you want to include the <i>default templates</i>, bundled with most of the directives. These templates are based on Bootstrap's markup and CSS.</small>
</div>
Expand Down Expand Up @@ -298,7 +299,7 @@ <h4 style="text-align: center;">{{buildErrorText}}</h4>
style="width: 33%; border-radius: 0;"
ng-class="{'btn-primary': module.<%= module.name %>}"
ng-model="module.<%= module.name %>"
btn-checkbox
uib-btn-checkbox
ng-change="selectedChanged('<%= module.name %>', module.<%= module.name %>)">
<%= module.displayName %>
</button>
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"author": "https://github.com/angular-ui/bootstrap/graphs/contributors",
"name": "angular-ui-bootstrap",
"version": "0.13.4-SNAPSHOT",
"version": "0.14.3-SNAPSHOT",
"homepage": "http://angular-ui.github.io/bootstrap/",
"dependencies": {},
"scripts":{
Expand All @@ -12,8 +12,9 @@
"url": "https://github.com/angular-ui/bootstrap.git"
},
"devDependencies": {
"angular": "^1.4.3",
"angular-mocks": "^1.4.3",
"angular": "^1.4.4",
"angular-mocks": "^1.4.4",
"angular-sanitize": "^1.4.4",
"grunt": "^0.4.5",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-copy": "^0.8.0",
Expand Down
Loading