Skip to content

Datetime picker does select provided date #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tianxu0836 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Datetime picker does select provided date #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96c2f45
Update angular-bootstrap-datetimepicker-directive.js
tianxu0836 Apr 2, 2015
4f757d9
Update angular-bootstrap-datetimepicker-directive.js
tianxu0836 Apr 2, 2015
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
98 changes: 49 additions & 49 deletions angular-bootstrap-datetimepicker-directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
'use strict';

angular
.module('datetimepicker', [])

.provider('datetimepicker', function () {
var default_options = {};

this.setOptions = function (options) {
default_options = options;
};

this.$get = function () {
return {
getOptions: function () {
return default_options;
.module('datetimepicker', [])
.provider('datetimepicker', function() {
var default_options = {};
this.setOptions = function(options) {
default_options = options;
};
this.$get = function() {
return {
getOptions: function() {
return default_options;
}
};
};
})
.directive('datetimepicker', [
'$timeout',
'datetimepicker',
function($timeout,
datetimepicker) {
var default_options = datetimepicker.getOptions();
return {
require: '?ngModel',
restrict: 'AE',
scope: {
datetimepickerOptions: '@'
},
link: function($scope, $element, $attrs, ngModelCtrl) {
var passed_in_options = $scope.$eval($attrs.datetimepickerOptions);
var options = jQuery.extend({}, default_options, passed_in_options);
$element
.on('dp.change', function(e) {
if (ngModelCtrl) {
$timeout(function() {
ngModelCtrl.$setViewValue(e.target.value);
});
}
})
.on('dp.show', function (e) {
var that = this;
if (ngModelCtrl) {
$timeout(function() {
$(that).data("DateTimePicker").date(e.target.value);
});
}
})
.datetimepicker(options);
}
};
}
};
};
})

.directive('datetimepicker', [
'$timeout',
'datetimepicker',
function ($timeout,
datetimepicker) {

var default_options = datetimepicker.getOptions();

return {
require : '?ngModel',
restrict: 'AE',
scope : {
datetimepickerOptions: '@'
},
link : function ($scope, $element, $attrs, ngModelCtrl) {
var passed_in_options = $scope.$eval($attrs.datetimepickerOptions);
var options = jQuery.extend({}, default_options, passed_in_options);

$element
.on('dp.change', function (on_change_event) {
if (ngModelCtrl) {
$timeout(function () {
ngModelCtrl.$setViewValue(on_change_event.target.value);
});
}
})
.datetimepicker(options);
}
};
}
]);
]);