Skip to content

fix: active button feature [ISSUE 24] #32

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
IvAlex1986 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: active button feature [ISSUE 24] #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 48 additions & 46 deletions angular-bootstrap-datetimepicker-directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ angular
.module('datetimepicker', [])

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

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

this.$get = function () {
return {
getOptions: function () {
return default_options;
}
this.$get = function () {
return {
getOptions: function () {
return default_options;
}
};
};
};
})

.directive('datetimepicker', [
Expand All @@ -25,48 +25,50 @@ angular
function ($timeout,
datetimepicker) {

var default_options = datetimepicker.getOptions();
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);
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);
});
}
})
.datetimepicker(options);
$element
.on('dp.change', function (e) {
if (ngModelCtrl) {
$timeout(function () {
var target = $(e.target);
target = (target.is('input') || options.inline) ? target : target.find("input");
ngModelCtrl.$setViewValue(target.val());
});
}
})
.datetimepicker(options);

function setPickerValue() {
var date = options.defaultDate || null;
function setPickerValue() {
var date = options.defaultDate || null;

if (ngModelCtrl && ngModelCtrl.$viewValue) {
date = ngModelCtrl.$viewValue;
}
if (ngModelCtrl && ngModelCtrl.$viewValue) {
date = ngModelCtrl.$viewValue;
}

$element
.data('DateTimePicker')
.date(date);
}
$element
.data('DateTimePicker')
.date(date);
}

if (ngModelCtrl) {
ngModelCtrl.$render = function () {
setPickerValue();
};
}
if (ngModelCtrl) {
ngModelCtrl.$render = function () {
setPickerValue();
};
}

setPickerValue();
}
};
setPickerValue();
}
};
}
]);
2 changes: 1 addition & 1 deletion angular-bootstrap-datetimepicker-directive.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,21 @@ <h3 style="text-align: center;">
</div>
</div>

<div class="form-group">
<label for="dt10" class="col-sm-3 control-label">Active Button</label>

<div class="col-sm-7">
<div class='input-group date'
datetimepicker
datetimepicker-options="{sideBySide:true}" >
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
<input type='text' class="form-control" placeholder="..." />
</div>
</div>
</div>

<div class="form-group">
<label for="dt8" class="col-sm-3 control-label">Inline</label>

Expand Down