mirror of
https://github.com/xdan/datetimepicker.git
synced 2024-11-18 06:24:22 +00:00
New version 2.5.2 Fix devDependencies with concat-cli
This commit is contained in:
Chupurnov Valeriy
parent
b182ddf000
commit
f4c063f13a
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "datetimepicker",
|
||||
"version": "2.5.1",
|
||||
"version": "2.5.2",
|
||||
"main": [
|
||||
"build/jquery.datetimepicker.full.min.js",
|
||||
"jquery.datetimepicker.css"
|
||||
|
||||
@ -1091,6 +1091,15 @@ var DateFormatter;
|
||||
"Dumengia", "Glindesdi", "Mardi", "Mesemna", "Gievgia", "Venderdi", "Sonda"
|
||||
]
|
||||
},
|
||||
ka: { // Georgian
|
||||
months: [
|
||||
'იანვარი', 'თებერვალი', 'მარტი', 'აპრილი', 'მაისი', 'ივნისი', 'ივლისი', 'აგვისტო', 'სექტემბერი', 'ოქტომბერი', 'ნოემბერი', 'დეკემბერი'
|
||||
],
|
||||
dayOfWeekShort: [
|
||||
"კვ", "ორშ", "სამშ", "ოთხ", "ხუთ", "პარ", "შაბ"
|
||||
],
|
||||
dayOfWeek: ["კვირა", "ორშაბათი", "სამშაბათი", "ოთხშაბათი", "ხუთშაბათი", "პარასკევი", "შაბათი"]
|
||||
},
|
||||
},
|
||||
value: '',
|
||||
rtl: false,
|
||||
@ -1215,6 +1224,9 @@ var DateFormatter;
|
||||
initDateFormatter();
|
||||
}
|
||||
},
|
||||
setDateFormatter: function(dateFormatter) {
|
||||
dateHelper = dateFormatter;
|
||||
},
|
||||
RFC_2822: 'D, d M Y H:i:s O',
|
||||
ATOM: 'Y-m-d\TH:i:sP',
|
||||
ISO_8601: 'Y-m-d\TH:i:sO',
|
||||
@ -1740,7 +1752,7 @@ var DateFormatter;
|
||||
input
|
||||
.off('blur.xdsoft')
|
||||
.on('blur.xdsoft', function () {
|
||||
if (options.allowBlank && (!$.trim($(this).val()).length || $.trim($(this).val()) === options.mask.replace(/[0-9]/g, '_'))) {
|
||||
if (options.allowBlank && (!$.trim($(this).val()).length || (typeof options.mask == "string" && $.trim($(this).val()) === options.mask.replace(/[0-9]/g, '_')))) {
|
||||
$(this).val(null);
|
||||
datetimepicker.data('xdsoft_datetime').empty();
|
||||
} else if (!dateHelper.parseDate($(this).val(), options.format)) {
|
||||
@ -2056,7 +2068,20 @@ var DateFormatter;
|
||||
} else if ($this.hasClass(options.prev) && top - options.timeHeightInTimePicker >= 0) {
|
||||
timebox.css('marginTop', '-' + (top - options.timeHeightInTimePicker) + 'px');
|
||||
}
|
||||
timeboxparent.trigger('scroll_element.xdsoft_scroller', [Math.abs(parseInt(timebox.css('marginTop'), 10) / (height - pheight))]);
|
||||
/**
|
||||
* Fixed bug:
|
||||
* When using css3 transition, it will cause a bug that you cannot scroll the timepicker list.
|
||||
* The reason is that the transition-duration time, if you set it to 0, all things fine, otherwise, this
|
||||
* would cause a bug when you use jquery.css method.
|
||||
* Let's say: * { transition: all .5s ease; }
|
||||
* jquery timebox.css('marginTop') will return the original value which is before you clicking the next/prev button,
|
||||
* meanwhile the timebox[0].style.marginTop will return the right value which is after you clicking the
|
||||
* next/prev button.
|
||||
*
|
||||
* What we should do:
|
||||
* Replace timebox.css('marginTop') with timebox[0].style.marginTop.
|
||||
*/
|
||||
timeboxparent.trigger('scroll_element.xdsoft_scroller', [Math.abs(parseInt(timebox[0].style.marginTop, 10) / (height - pheight))]);
|
||||
period = (period > 10) ? 10 : period - 10;
|
||||
if (!stop) {
|
||||
timer = setTimeout(arguments_callee4, v || period);
|
||||
|
||||
4
build/jquery.datetimepicker.full.min.js
vendored
4
build/jquery.datetimepicker.full.min.js
vendored
File diff suppressed because one or more lines are too long
4
build/jquery.datetimepicker.min.js
vendored
4
build/jquery.datetimepicker.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "datetimepicker",
|
||||
"version": "2.5.1",
|
||||
"version": "2.5.2",
|
||||
"title": "jQuery Date and Time picker",
|
||||
"description": "jQuery plugin for date, time, or datetime manipulation in form",
|
||||
"keywords": [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* @preserve jQuery DateTimePicker plugin v2.5.1
|
||||
* @preserve jQuery DateTimePicker plugin v2.5.2
|
||||
* @homepage http://xdsoft.net/jqplugins/datetimepicker/
|
||||
* @author Chupurnov Valeriy (<chupurnov@gmail.com>)
|
||||
*/
|
||||
|
||||
35
npm-debug.log
Normal file
35
npm-debug.log
Normal file
@ -0,0 +1,35 @@
|
||||
0 info it worked if it ends with ok
|
||||
1 verbose cli [ 'c:\\Program Files\\nodejs\\node.exe',
|
||||
1 verbose cli 'c:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js',
|
||||
1 verbose cli 'run',
|
||||
1 verbose cli 'github' ]
|
||||
2 info using npm@2.14.7
|
||||
3 info using node@v5.7.0
|
||||
4 verbose stack Error: Failed to parse json
|
||||
4 verbose stack Unexpected token '.' at 11:84
|
||||
4 verbose stack "git add --all && git commit -m \"New version %npm_package_version%\. Fix devD
|
||||
4 verbose stack ^
|
||||
4 verbose stack at parseError (c:\Program Files\nodejs\node_modules\npm\node_modules\read-package-json\read-json.js:379:11)
|
||||
4 verbose stack at parseJson (c:\Program Files\nodejs\node_modules\npm\node_modules\read-package-json\read-json.js:68:23)
|
||||
4 verbose stack at c:\Program Files\nodejs\node_modules\npm\node_modules\read-package-json\read-json.js:48:5
|
||||
4 verbose stack at c:\Program Files\nodejs\node_modules\npm\node_modules\graceful-fs\graceful-fs.js:76:16
|
||||
4 verbose stack at tryToString (fs.js:414:3)
|
||||
4 verbose stack at FSReqWrap.readFileAfterClose [as oncomplete] (fs.js:401:12)
|
||||
5 verbose cwd c:\WebServers\home\analize\datetimepicker
|
||||
6 error Windows_NT 6.1.7601
|
||||
7 error argv "c:\\Program Files\\nodejs\\node.exe" "c:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js" "run" "github"
|
||||
8 error node v5.7.0
|
||||
9 error npm v2.14.7
|
||||
10 error file c:\WebServers\home\analize\datetimepicker\package.json
|
||||
11 error code EJSONPARSE
|
||||
12 error Failed to parse json
|
||||
12 error Unexpected token '.' at 11:84
|
||||
12 error "git add --all && git commit -m \"New version %npm_package_version%\. Fix devD
|
||||
12 error ^
|
||||
13 error File: c:\WebServers\home\analize\datetimepicker\package.json
|
||||
14 error Failed to parse package.json data.
|
||||
14 error package.json must be actual JSON, not just JavaScript.
|
||||
14 error
|
||||
14 error This is not a bug in npm.
|
||||
14 error Tell the package author to fix their package.json file. JSON.parse
|
||||
15 verbose exit [ 1, true ]
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "jquery-datetimepicker",
|
||||
"version": "2.5.1",
|
||||
"version": "2.5.2",
|
||||
"description": "jQuery Plugin DateTimePicker it is DatePicker and TimePicker in one",
|
||||
"main": "build/jquery.datetimepicker.full.min.js",
|
||||
"scripts": {
|
||||
@ -8,7 +8,7 @@
|
||||
"concat": "concat-cli -f bower_components/php-date-formatter/js/php-date-formatter.js jquery.datetimepicker.js bower_components/jquery-mousewheel/jquery.mousewheel.js -o build/jquery.datetimepicker.full.js",
|
||||
"minify": "uglifyjs jquery.datetimepicker.js -c -m -o build/jquery.datetimepicker.min.js",
|
||||
"minifyconcat": "uglifyjs build/jquery.datetimepicker.full.js -c -m -o build/jquery.datetimepicker.full.min.js",
|
||||
"github": "git add --all && git commit -m \"New version %npm_package_version%\" && git tag %npm_package_version% && git push --tags origin HEAD:master && npm publish",
|
||||
"github": "git add --all && git commit -m \"New version %npm_package_version% Fix devDependencies with concat-cli\" && git tag %npm_package_version% && git push --tags origin HEAD:master && npm publish",
|
||||
"build": "npm run minify && npm run concat && npm run minifyconcat"
|
||||
},
|
||||
"repository": {
|
||||
@ -36,7 +36,8 @@
|
||||
"php-date-formatter": ">= 1.3.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"concat-cli": "~4.0",
|
||||
"concat": "azer/concat",
|
||||
"concat-cli": "^4.0.0",
|
||||
"uglifyjs": "^2.4.10"
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user