library-mirrors/datetimepicker
1
0
Fork 0
mirror of https://github.com/xdan/datetimepicker.git synced 2024-11-18 06:24:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #697 from xdan/revert-694-master

Browse Source 
Revert "fix removing symbols with cmd or selecting"
This commit is contained in:
Valeriy Chupurnov 2019-02-23 13:29:37 +03:00 committed by GitHub
commit 3451e14ed5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitignore vendored
View File

@ -1,20 +0,0 @@
lib
node_modules
*.log
.idea
.vscode/
# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
npm-debug.log*
yarn-debug.log*
yarn-error.log*
package-lock.json
/.nyc_output/
coverage/
/coverage/

51
build/jquery.datetimepicker.full.js
View File

@ -636,8 +636,7 @@ var datetimepickerFactory = function ($) {
beforeShowDay: null, beforeShowDay: null,
enterLikeTab: true, enterLikeTab: true,
showApplyButton: false, showApplyButton: false
insideParent: false,
}; };
var dateHelper = null, var dateHelper = null,
@ -943,8 +942,7 @@ var datetimepickerFactory = function ($) {
KEY9 = 57, KEY9 = 57,
_KEY0 = 96, _KEY0 = 96,
_KEY9 = 105, _KEY9 = 105,
CTRLKEY = 17, CTRLKEY = 17,
CMDKEY = 91,
DEL = 46, DEL = 46,
ENTER = 13, ENTER = 13,
ESC = 27, ESC = 27,
@ -960,8 +958,7 @@ var datetimepickerFactory = function ($) {
VKEY = 86, VKEY = 86,
ZKEY = 90, ZKEY = 90,
YKEY = 89, YKEY = 89,
ctrlDown = false, ctrlDown = false,
cmdDown = false,
options = ($.isPlainObject(opt) || !opt) ? $.extend(true, {}, default_options, opt) : $.extend(true, {}, default_options), options = ($.isPlainObject(opt) || !opt) ? $.extend(true, {}, default_options, opt) : $.extend(true, {}, default_options),
lazyInitTimer = 0, lazyInitTimer = 0,
@ -1356,11 +1353,8 @@ var datetimepickerFactory = function ($) {
.append(calendar) .append(calendar)
.append(applyButton); .append(applyButton);
if (options.insideParent) { $(options.parentID)
$(input).parent().append(datetimepicker); .append(datetimepicker);
} else {
$(options.parentID).append(datetimepicker);
}
XDSoft_datetime = function () { XDSoft_datetime = function () {
var _this = this; var _this = this;
@ -2186,7 +2180,7 @@ var datetimepickerFactory = function ($) {
} }
}); });
if (dateInputHasFixedAncestor && !options.insideParent) { if (dateInputHasFixedAncestor) {
position = 'fixed'; position = 'fixed';
//If the picker won't fit entirely within the viewport then display it above the date input. //If the picker won't fit entirely within the viewport then display it above the date input.
@ -2226,16 +2220,12 @@ var datetimepickerFactory = function ($) {
datetimepickerCss = { datetimepickerCss = {
position: position, position: position,
left: options.insideParent ? dateInputElem.offsetLeft : left, left: left,
top: '', //Initialize to prevent previous values interfering with new ones. top: '', //Initialize to prevent previous values interfering with new ones.
bottom: '' //Initialize to prevent previous values interfering with new ones. bottom: '' //Initialize to prevent previous values interfering with new ones.
}; };
if (options.insideParent) { datetimepickerCss[verticalAnchorEdge] = verticalPosition;
datetimepickerCss[verticalAnchorEdge] = dateInputElem.offsetTop + dateInputElem.offsetHeight;
} else {
datetimepickerCss[verticalAnchorEdge] = verticalPosition;
}
datetimepicker.css(datetimepickerCss); datetimepicker.css(datetimepickerCss);
}; };
@ -2463,12 +2453,8 @@ var datetimepickerFactory = function ($) {
// hitting backspace in a selection, you can possibly go back any further - go forward // hitting backspace in a selection, you can possibly go back any further - go forward
pos += (key === BACKSPACE && !hasSel) ? -1 : 1; pos += (key === BACKSPACE && !hasSel) ? -1 : 1;
} }
if (event.metaKey) { // cmd has been pressed
pos = 0;
hasSel = true;
}
if (hasSel) { if (hasSel) {
// pos might have moved so re-calc length // pos might have moved so re-calc length
@ -2590,27 +2576,16 @@ var datetimepickerFactory = function ($) {
} }
}; };
$(options.ownerDocument) $(options.ownerDocument)
.off('keydown.xdsoftctrl keyup.xdsoftctrl') .off('keydown.xdsoftctrl keyup.xdsoftctrl')
.off('keydown.xdsoftcmd keyup.xdsoftcmd')
.on('keydown.xdsoftctrl', function (e) { .on('keydown.xdsoftctrl', function (e) {
if (e.keyCode === CTRLKEY) { if (e.keyCode === CTRLKEY) {
ctrlDown = true; ctrlDown = true;
} }
}) })
.on('keyup.xdsoftctrl', function (e) { .on('keyup.xdsoftctrl', function (e) {
if (e.keyCode === CTRLKEY) { if (e.keyCode === CTRLKEY) {
ctrlDown = false; ctrlDown = false;
} }
})
.on('keydown.xdsoftcmd', function (e) {
if (e.keyCode === CMDKEY) {
cmdDown = true;
}
})
.on('keyup.xdsoftcmd', function (e) {
if (e.keyCode === CMDKEY) {
cmdDown = false;
}
}); });
this.each(function () { this.each(function () {

2
build/jquery.datetimepicker.full.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
build/jquery.datetimepicker.min.js vendored
View File

File diff suppressed because one or more lines are too long

59
jquery.datetimepicker.js
View File

@ -627,8 +627,7 @@ var datetimepickerFactory = function ($) {
beforeShowDay: null, beforeShowDay: null,
enterLikeTab: true, enterLikeTab: true,
showApplyButton: false, showApplyButton: false
insideParent: false,
}; };
var dateHelper = null, var dateHelper = null,
@ -729,7 +728,8 @@ var datetimepickerFactory = function ($) {
} }
var isFormatStandard = function(format){ var isFormatStandard = function(format){
return Object.values(standardFormats).indexOf(format) === -1 ? false : true; return $.map(standardFormats, function (val) { return val })
.indexOf(format) === -1 ? false : true;
} }
$.extend($.datetimepicker, standardFormats); $.extend($.datetimepicker, standardFormats);
@ -934,8 +934,7 @@ var datetimepickerFactory = function ($) {
KEY9 = 57, KEY9 = 57,
_KEY0 = 96, _KEY0 = 96,
_KEY9 = 105, _KEY9 = 105,
CTRLKEY = 17, CTRLKEY = 17,
CMDKEY = 91,
DEL = 46, DEL = 46,
ENTER = 13, ENTER = 13,
ESC = 27, ESC = 27,
@ -951,8 +950,7 @@ var datetimepickerFactory = function ($) {
VKEY = 86, VKEY = 86,
ZKEY = 90, ZKEY = 90,
YKEY = 89, YKEY = 89,
ctrlDown = false, ctrlDown = false,
cmdDown = false,
options = ($.isPlainObject(opt) || !opt) ? $.extend(true, {}, default_options, opt) : $.extend(true, {}, default_options), options = ($.isPlainObject(opt) || !opt) ? $.extend(true, {}, default_options, opt) : $.extend(true, {}, default_options),
lazyInitTimer = 0, lazyInitTimer = 0,
@ -1347,11 +1345,8 @@ var datetimepickerFactory = function ($) {
.append(calendar) .append(calendar)
.append(applyButton); .append(applyButton);
if (options.insideParent) { $(options.parentID)
$(input).parent().append(datetimepicker); .append(datetimepicker);
} else {
$(options.parentID).append(datetimepicker);
}
XDSoft_datetime = function () { XDSoft_datetime = function () {
var _this = this; var _this = this;
@ -2177,7 +2172,7 @@ var datetimepickerFactory = function ($) {
} }
}); });
if (dateInputHasFixedAncestor && !options.insideParent) { if (dateInputHasFixedAncestor) {
position = 'fixed'; position = 'fixed';
//If the picker won't fit entirely within the viewport then display it above the date input. //If the picker won't fit entirely within the viewport then display it above the date input.
@ -2217,16 +2212,12 @@ var datetimepickerFactory = function ($) {
datetimepickerCss = { datetimepickerCss = {
position: position, position: position,
left: options.insideParent ? dateInputElem.offsetLeft : left, left: left,
top: '', //Initialize to prevent previous values interfering with new ones. top: '', //Initialize to prevent previous values interfering with new ones.
bottom: '' //Initialize to prevent previous values interfering with new ones. bottom: '' //Initialize to prevent previous values interfering with new ones.
}; };
if (options.insideParent) { datetimepickerCss[verticalAnchorEdge] = verticalPosition;
datetimepickerCss[verticalAnchorEdge] = dateInputElem.offsetTop + dateInputElem.offsetHeight;
} else {
datetimepickerCss[verticalAnchorEdge] = verticalPosition;
}
datetimepicker.css(datetimepickerCss); datetimepicker.css(datetimepickerCss);
}; };
@ -2380,7 +2371,7 @@ var datetimepickerFactory = function ($) {
setCaretPos(input[0], 0); setCaretPos(input[0], 0);
} }
input.on('paste.xdsoft', function (event) { input.off('paste.xdsoft').on('paste.xdsoft', function (event) {
// couple options here // couple options here
// 1. return false - tell them they can't paste // 1. return false - tell them they can't paste
// 2. insert over current characters - minimal validation // 2. insert over current characters - minimal validation
@ -2398,7 +2389,8 @@ var datetimepickerFactory = function ($) {
var valueBeforeCursor = val.substr(0, pos); var valueBeforeCursor = val.substr(0, pos);
var valueAfterPaste = val.substr(pos + pastedData.length); var valueAfterPaste = val.substr(pos + pastedData.length);
val = valueBeforeCursor + pastedData + valueAfterPaste; val = valueBeforeCursor + pastedData + valueAfterPaste;
val = val.substring(0, options.mask.length)
pos += pastedData.length; pos += pastedData.length;
if (isValidValue(options.mask, val)) { if (isValidValue(options.mask, val)) {
@ -2454,12 +2446,8 @@ var datetimepickerFactory = function ($) {
// hitting backspace in a selection, you can possibly go back any further - go forward // hitting backspace in a selection, you can possibly go back any further - go forward
pos += (key === BACKSPACE && !hasSel) ? -1 : 1; pos += (key === BACKSPACE && !hasSel) ? -1 : 1;
} }
if (event.metaKey) { // cmd has been pressed
pos = 0;
hasSel = true;
}
if (hasSel) { if (hasSel) {
// pos might have moved so re-calc length // pos might have moved so re-calc length
@ -2581,27 +2569,16 @@ var datetimepickerFactory = function ($) {
} }
}; };
$(options.ownerDocument) $(options.ownerDocument)
.off('keydown.xdsoftctrl keyup.xdsoftctrl') .off('keydown.xdsoftctrl keyup.xdsoftctrl')
.off('keydown.xdsoftcmd keyup.xdsoftcmd')
.on('keydown.xdsoftctrl', function (e) { .on('keydown.xdsoftctrl', function (e) {
if (e.keyCode === CTRLKEY) { if (e.keyCode === CTRLKEY) {
ctrlDown = true; ctrlDown = true;
} }
}) })
.on('keyup.xdsoftctrl', function (e) { .on('keyup.xdsoftctrl', function (e) {
if (e.keyCode === CTRLKEY) { if (e.keyCode === CTRLKEY) {
ctrlDown = false; ctrlDown = false;
} }
})
.on('keydown.xdsoftcmd', function (e) {
if (e.keyCode === CMDKEY) {
cmdDown = true;
}
})
.on('keyup.xdsoftcmd', function (e) {
if (e.keyCode === CMDKEY) {
cmdDown = false;
}
}); });
this.each(function () { this.each(function () {