Skip to content

Allow updating every parameter after first initialization #15

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

Merged
merged 1 commit into from
Aug 15, 2017
Merged

Allow updating every parameter after first initialization #15

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
38 changes: 24 additions & 14 deletions js/angular-material-datetimepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,16 @@
'</md-dialog>';

angular.module(moduleName, ['ngMaterial'])
.provider('mdcDatetimePickerDefaultLocale', function () {
this.locale = window.navigator.userLanguage || window.navigator.language || 'en';

.service('mdcDatetimePickerDefaultLocale', ['mdcDefaultParams', function (mdcDefaultParams) {
this.$get = function () {
return this;
return mdcDefaultParams().lang;
};

this.setDefaultLocale = function (localeString) {
this.locale = localeString;
mdcDefaultParams({ lang: localeString });
};
})
.factory('mdcDefaultParams', ['mdcDatetimePickerDefaultLocale', function (mdcDatetimePickerDefaultLocale) {
}])
.factory('mdcDefaultParams', function () {
var default_params = {
date: true,
time: true,
Expand All @@ -100,7 +98,7 @@
minDate: null,
maxDate: null,
currentDate: null,
lang: mdcDatetimePickerDefaultLocale.locale,
lang: window.navigator.userLanguage || window.navigator.language || 'en',
weekStart: 0,
shortTime: false,
cancelText: 'Cancel',
Expand All @@ -116,8 +114,19 @@
clickOutsideToClose: false,
minuteSteps: 5
};
return default_params;
}])

return function (params) {
if (params) {
for (var i in params) {
if (default_params.hasOwnProperty(i) && params.hasOwnProperty(i)) {
default_params[i] = params[i];
}
}
}

return default_params;
};
})
.directive('mdcDatetimePicker', ['$mdDialog', '$timeout',
function ($mdDialog, $timeout) {

Expand Down Expand Up @@ -260,7 +269,7 @@
minDate: {strign} =null,
maxDate: {string} =null,
currentDate: {string} =null,
lang: {string} =mdcDatetimePickerDefaultLocale,
lang: {string} =window.navigator.userLanguage || window.navigator.language || 'en',
weekStart: {int} =0,
shortTime: {boolean} =false,
cancelText: {string} ='Cancel',
Expand All @@ -280,11 +289,12 @@
@return promise
*/
.factory('mdcDateTimeDialog', ["$mdDialog", "$q", "mdcDefaultParams", function ($mdDialog, $q, mdcDefaultParams) {
var accepted_options = Object.keys(mdcDefaultParams);
var defaultParams = mdcDefaultParams();
var accepted_options = Object.keys(defaultParams);
var service = {
show: function (options) {
var deferred = $q.defer();
var params = angular.copy(mdcDefaultParams);
var params = angular.copy(defaultParams);
for (var i in options) {
if (accepted_options.indexOf[i] != -1 && options.hasOwnProperty(i)) {
params = options[i];
Expand Down Expand Up @@ -329,7 +339,7 @@

this._attachedEvents = [];
this.VIEWS = VIEW_STATES;
this.params = angular.copy(mdcDefaultParams);
this.params = angular.copy(mdcDefaultParams());
this.meridien = 'AM';
this.params = angular.extend(this.params, this.options);

Expand Down