svn commit: r1069542 - in /ofbiz/trunk: framework/common/widget/ framework/images/webapp/images
Locked
 
|
Author: erwan
Date: Thu Feb 10 19:45:22 2011 New Revision: 1069542 URL: http://svn.apache.org/viewvc?rev=1069542&view=rev Log: OFBIZ-4170 : a bug was present in the timepicker plugin and values under 01:05:10 couldn't be selected Added: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.js (with props) ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js (with props) Removed: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.1.js ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.1.min.js Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1069542&r1=1069541&r2=1069542&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Thu Feb 10 19:45:22 2011 @@ -108,7 +108,7 @@ under the License. <!-- The default (global) java scripts --> <!-- jQuery part --> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.6.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> @@ -330,7 +330,7 @@ under the License. <!-- The default (global) java scripts --> <!-- jQuery part --> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.6.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/> Added: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.js URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.js?rev=1069542&view=auto ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.js (added) +++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.js Thu Feb 10 19:45:22 2011 @@ -0,0 +1,918 @@ +/* +* jQuery timepicker addon +* By: Trent Richardson [http://trentrichardson.com] +* Version 0.9.3 +* Last Modified: 02/05/2011 +* +* Copyright 2010 Trent Richardson +* Dual licensed under the MIT and GPL licenses. +* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt +* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt +* +* HERES THE CSS: +* .ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; } +* .ui-timepicker-div dl{ text-align: left; } +* .ui-timepicker-div dl dt{ height: 25px; } +* .ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; } +* .ui-timepicker-div td { font-size: 90%; } +*/ + +(function($) { + +$.extend($.ui, { timepicker: { version: "0.9.3" } }); + +/* Time picker manager. + Use the singleton instance of this class, $.timepicker, to interact with the time picker. + Settings for (groups of) time pickers are maintained in an instance object, + allowing multiple different settings on the same page. */ + +function Timepicker() { + this.regional = []; // Available regional settings, indexed by language code + this.regional[''] = { // Default regional settings + currentText: 'Now', + closeText: 'Done', + ampm: false, + timeFormat: 'hh:mm tt', + timeOnlyTitle: 'Choose Time', + timeText: 'Time', + hourText: 'Hour', + minuteText: 'Minute', + secondText: 'Second' + }; + this._defaults = { // Global defaults for all the datetime picker instances + showButtonPanel: true, + timeOnly: false, + showHour: true, + showMinute: true, + showSecond: false, + showTime: true, + stepHour: 0.05, + stepMinute: 0.05, + stepSecond: 0.05, + hour: 0, + minute: 0, + second: 0, + hourMin: 0, + minuteMin: 0, + secondMin: 0, + hourMax: 23, + minuteMax: 59, + secondMax: 59, + minDateTime: null, + maxDateTime: null, + hourGrid: 0, + minuteGrid: 0, + secondGrid: 0, + alwaysSetTime: true, + separator: ' ', + altFieldTimeOnly: true, + showTimepicker: true + }; + $.extend(this._defaults, this.regional['']); +} + +$.extend(Timepicker.prototype, { + $input: null, + $altInput: null, + $timeObj: null, + inst: null, + hour_slider: null, + minute_slider: null, + second_slider: null, + hour: 0, + minute: 0, + second: 0, + hourMinOriginal: null, + minuteMinOriginal: null, + secondMinOriginal: null, + hourMaxOriginal: null, + minuteMaxOriginal: null, + secondMaxOriginal: null, + ampm: '', + formattedDate: '', + formattedTime: '', + formattedDateTime: '', + + /* Override the default settings for all instances of the time picker. + @param settings object - the new settings to use as defaults (anonymous object) + @return the manager object */ + setDefaults: function(settings) { + extendRemove(this._defaults, settings || {}); + return this; + }, + + //######################################################################## + // Create a new Timepicker instance + //######################################################################## + _newInst: function($input, o) { + var tp_inst = new Timepicker(), + inlineSettings = {}; + + tp_inst.hour = tp_inst._defaults.hour; + tp_inst.minute = tp_inst._defaults.minute; + tp_inst.second = tp_inst._defaults.second; + tp_inst.ampm = ''; + tp_inst.$input = $input; + + + for (var attrName in this._defaults) { + var attrValue = $input.attr('time:' + attrName); + if (attrValue) { + try { + inlineSettings[attrName] = eval(attrValue); + } catch (err) { + inlineSettings[attrName] = attrValue; + } + } + } + tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, { + beforeShow: function(input, dp_inst) { + // MOD for OFBIz - set the current time when timepicker is open + var nowTime = new Date(); + tp_inst.hour = tp_inst._defaults.hour === 0 ? nowTime.getHours() : tp_inst._defaults.hour; + tp_inst.minute = tp_inst._defaults.minute === 0 ? nowTime.getMinutes() : tp_inst._defaults.minute; + tp_inst.second = tp_inst._defaults.second === 0 ? nowTime.getSeconds() : tp_inst._defaults.second; + // END MOD for OFBIz - set the current time when timepicker is open + + if ($.isFunction(o.beforeShow)) + o.beforeShow(input, dp_inst, tp_inst); + }, + onChangeMonthYear: function(year, month, dp_inst) { + // Update the time as well : this prevents the time from disappearing from the $input field. + tp_inst._updateDateTime(dp_inst); + if ($.isFunction(o.onChangeMonthYear)) + o.onChangeMonthYear(year, month, dp_inst, tp_inst); + }, + onClose: function(dateText, dp_inst) { + if (tp_inst.timeDefined === true && $input.val() != '') + tp_inst._updateDateTime(dp_inst); + if ($.isFunction(o.onClose)) + o.onClose(dateText, dp_inst, tp_inst); + }, + timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker'); + }); + + if (o.altField) + tp_inst.$altInput = $(o.altField) + .css({ cursor: 'pointer' }) + .focus(function(){ $input.trigger("focus"); }); + + // datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime.. + if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) + tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime()); + if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) + tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime()); + if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) + tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime()); + if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) + tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime()); + + return tp_inst; + }, + + //######################################################################## + // add our sliders to the calendar + //######################################################################## + _addTimePicker: function(dp_inst) { + var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? + this.$input.val() + ' ' + this.$altInput.val() : + this.$input.val(); + + this.timeDefined = this._parseTime(currDT); + this._limitMinMaxDateTime(dp_inst, false); + this._injectTimePicker(); + }, + + //######################################################################## + // parse the time string from input value or _setTime + //######################################################################## + _parseTime: function(timeString, withDate) { + var regstr = this._defaults.timeFormat.toString() + .replace(/h{1,2}/ig, '(\\d?\\d)') + .replace(/m{1,2}/ig, '(\\d?\\d)') + .replace(/s{1,2}/ig, '(\\d?\\d)') + .replace(/t{1,2}/ig, '(am|pm|a|p)?') + .replace(/\s/g, '\\s?') + '$', + order = this._getFormatPositions(), + treg; + + if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]); + + if (withDate || !this._defaults.timeOnly) { + // the time should come after x number of characters and a space. + // x = at least the length of text specified by the date format + var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat'); + regstr = '.{' + dp_dateFormat.length + ',}' + this._defaults.separator + regstr; + } + + treg = timeString.match(new RegExp(regstr, 'i')); + + if (treg) { + if (order.t !== -1) + this.ampm = ((treg[order.t] === undefined || treg[order.t].length === 0) ? + '' : + (treg[order.t].charAt(0).toUpperCase() == 'A') ? 'AM' : 'PM').toUpperCase(); + + if (order.h !== -1) { + if (this.ampm == 'AM' && treg[order.h] == '12') + this.hour = 0; // 12am = 0 hour + else if (this.ampm == 'PM' && treg[order.h] != '12') + this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0); // 12pm = 12 hour, any other pm = hour + 12 + else this.hour = Number(treg[order.h]); + } + + if (order.m !== -1) this.minute = Number(treg[order.m]); + if (order.s !== -1) this.second = Number(treg[order.s]); + + return true; + + } + return false; + }, + + //######################################################################## + // figure out position of time elements.. cause js cant do named captures + //######################################################################## + _getFormatPositions: function() { + var finds = this._defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|t{1,2})/g), + orders = { h: -1, m: -1, s: -1, t: -1 }; + + if (finds) + for (var i = 0; i < finds.length; i++) + if (orders[finds[i].toString().charAt(0)] == -1) + orders[finds[i].toString().charAt(0)] = i + 1; + + return orders; + }, + + //######################################################################## + // generate and inject html for timepicker into ui datepicker + //######################################################################## + _injectTimePicker: function() { + var $dp = this.inst.dpDiv, + o = this._defaults, + tp_inst = this, + // Added by Peter Medeiros: + // - Figure out what the hour/minute/second max should be based on the step values. + // - Example: if stepMinute is 15, then minMax is 45. + hourMax = (o.hourMax - (o.hourMax % o.stepHour)).toFixed(0), + minMax = (o.minuteMax - (o.minuteMax % o.stepMinute)).toFixed(0), + secMax = (o.secondMax - (o.secondMax % o.stepSecond)).toFixed(0), + dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, ''); + + // Prevent displaying twice + //if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) { + if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) { + var noDisplay = ' style="display:none;"', + html = '<div class="ui-timepicker-div" id="ui-timepicker-div-' + dp_id + '"><dl>' + + '<dt class="ui_tpicker_time_label" id="ui_tpicker_time_label_' + dp_id + '"' + + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' + + '<dd class="ui_tpicker_time" id="ui_tpicker_time_' + dp_id + '"' + + ((o.showTime) ? '' : noDisplay) + '></dd>' + + '<dt class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_' + dp_id + '"' + + ((o.showHour) ? '' : noDisplay) + '>' + o.hourText + '</dt>', + hourGridSize = 0, + minuteGridSize = 0, + secondGridSize = 0, + size; + + if (o.showHour && o.hourGrid > 0) { + html += '<dd class="ui_tpicker_hour">' + + '<div id="ui_tpicker_hour_' + dp_id + '"' + ((o.showHour) ? '' : noDisplay) + '></div>' + + '<div style="padding-left: 1px"><table><tr>'; + + for (var h = o.hourMin; h < hourMax; h += o.hourGrid) { + hourGridSize++; + var tmph = (o.ampm && h > 12) ? h-12 : h; + if (tmph < 10) tmph = '0' + tmph; + if (o.ampm) { + if (h == 0) tmph = 12 +'a'; + else if (h < 12) tmph += 'a'; + else tmph += 'p'; + } + html += '<td>' + tmph + '</td>'; + } + + html += '</tr></table></div>' + + '</dd>'; + } else html += '<dd class="ui_tpicker_hour" id="ui_tpicker_hour_' + dp_id + '"' + + ((o.showHour) ? '' : noDisplay) + '></dd>'; + + html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' + + ((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>'; + + if (o.showMinute && o.minuteGrid > 0) { + html += '<dd class="ui_tpicker_minute ui_tpicker_minute_' + o.minuteGrid + '">' + + '<div id="ui_tpicker_minute_' + dp_id + '"' + + ((o.showMinute) ? '' : noDisplay) + '></div>' + + '<div style="padding-left: 1px"><table><tr>'; + + for (var m = o.minuteMin; m < minMax; m += o.minuteGrid) { + minuteGridSize++; + html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>'; + } + + html += '</tr></table></div>' + + '</dd>'; + } else html += '<dd class="ui_tpicker_minute" id="ui_tpicker_minute_' + dp_id + '"' + + ((o.showMinute) ? '' : noDisplay) + '></dd>'; + + html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' + + ((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>'; + + if (o.showSecond && o.secondGrid > 0) { + html += '<dd class="ui_tpicker_second ui_tpicker_second_' + o.secondGrid + '">' + + '<div id="ui_tpicker_second_' + dp_id + '"' + + ((o.showSecond) ? '' : noDisplay) + '></div>' + + '<div style="padding-left: 1px"><table><tr>'; + + for (var s = o.secondMin; s < secMax; s += o.secondGrid) { + secondGridSize++; + html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>'; + } + + html += '</tr></table></div>' + + '</dd>'; + } else html += '<dd class="ui_tpicker_second" id="ui_tpicker_second_' + dp_id + '"' + + ((o.showSecond) ? '' : noDisplay) + '></dd>'; + + html += '</dl></div>'; + $tp = $(html); + + // if we only want time picker... + if (o.timeOnly === true) { + $tp.prepend( + '<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + + '</div>'); + $dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide(); + } + + this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({ + orientation: "horizontal", + value: this.hour, + min: o.hourMin, + max: hourMax, + step: o.stepHour, + slide: function(event, ui) { + tp_inst.hour_slider.slider( "option", "value", ui.value); + tp_inst._onTimeChange(); + } + }); + + // Updated by Peter Medeiros: + // - Pass in Event and UI instance into slide function + this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({ + orientation: "horizontal", + value: this.minute, + min: o.minuteMin, + max: minMax, + step: o.stepMinute, + slide: function(event, ui) { + // update the global minute slider instance value with the current slider value + tp_inst.minute_slider.slider( "option", "value", ui.value); + tp_inst._onTimeChange(); + } + }); + + this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({ + orientation: "horizontal", + value: this.second, + min: o.secondMin, + max: secMax, + step: o.stepSecond, + slide: function(event, ui) { + tp_inst.second_slider.slider( "option", "value", ui.value); + tp_inst._onTimeChange(); + } + }); + + // Add grid functionality + if (o.showHour && o.hourGrid > 0) { + size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin); + + $tp.find(".ui_tpicker_hour table").css({ + width: size + "%", + marginLeft: (size / (-2 * hourGridSize)) + "%", + borderCollapse: 'collapse' + }).find("td").each( function(index) { + $(this).click(function() { + var h = $(this).html(); + if(o.ampm) { + var ap = h.substring(2).toLowerCase(), + aph = parseInt(h.substring(0,2)); + if (ap == 'a') { + if (aph == 12) h = 0; + else h = aph; + } else if (aph == 12) h = 12; + else h = aph + 12; + } + tp_inst.hour_slider.slider("option", "value", h); + tp_inst._onTimeChange(); + }).css({ + cursor: 'pointer', + width: (100 / hourGridSize) + '%', + textAlign: 'center', + overflow: 'hidden' + }); + }); + } + + if (o.showMinute && o.minuteGrid > 0) { + size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin); + $tp.find(".ui_tpicker_minute table").css({ + width: size + "%", + marginLeft: (size / (-2 * minuteGridSize)) + "%", + borderCollapse: 'collapse' + }).find("td").each(function(index) { + $(this).click(function() { + tp_inst.minute_slider.slider("option", "value", $(this).html()); + tp_inst._onTimeChange(); + }).css({ + cursor: 'pointer', + width: (100 / minuteGridSize) + '%', + textAlign: 'center', + overflow: 'hidden' + }); + }); + } + + if (o.showSecond && o.secondGrid > 0) { + $tp.find(".ui_tpicker_second table").css({ + width: size + "%", + marginLeft: (size / (-2 * secondGridSize)) + "%", + borderCollapse: 'collapse' + }).find("td").each(function(index) { + $(this).click(function() { + tp_inst.second_slider.slider("option", "value", $(this).html()); + tp_inst._onTimeChange(); + }).css({ + cursor: 'pointer', + width: (100 / secondGridSize) + '%', + textAlign: 'center', + overflow: 'hidden' + }); + }); + } + + var $buttonPanel = $dp.find('.ui-datepicker-buttonpane'); + if ($buttonPanel.length) $buttonPanel.before($tp); + else $dp.append($tp); + + this.$timeObj = $('#ui_tpicker_time_'+ dp_id); + + if (this.inst !== null) { + var timeDefined = this.timeDefined; + this._onTimeChange(); + this.timeDefined = timeDefined; + } + + //Emulate datepicker onSelect behavior. Call on slidestop. + var onSelect = tp_inst._defaults['onSelect']; + if (onSelect) { + var inputEl = tp_inst.$input ? tp_inst.$input[0] : null; + var onSelectHandler = function() { + onSelect.apply(inputEl, [tp_inst.formattedDateTime, tp_inst]); // trigger custom callback*/ + } + this.hour_slider.bind('slidestop',onSelectHandler); + this.minute_slider.bind('slidestop',onSelectHandler); + this.second_slider.bind('slidestop',onSelectHandler); + } + } + }, + + //######################################################################## + // This function tries to limit the ability to go outside the + // min/max date range + //######################################################################## + _limitMinMaxDateTime: function(dp_inst, adjustSliders){ + var o = this._defaults, + dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay), + tp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay, this.hour, this.minute, this.second, 0); + + if(this._defaults.minDateTime !== null && dp_date){ + var minDateTime = this._defaults.minDateTime, + minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0); + + if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null){ + this.hourMinOriginal = o.hourMin; + this.minuteMinOriginal = o.minuteMin; + this.secondMinOriginal = o.secondMin; + } + + if(minDateTimeDate.getTime() == dp_date.getTime()){ + this._defaults.hourMin = minDateTime.getHours(); + this._defaults.minuteMin = minDateTime.getMinutes(); + this._defaults.secondMin = minDateTime.getSeconds(); + + if(this.hour < this._defaults.hourMin) this.hour = this._defaults.hourMin; + if(this.minute < this._defaults.minuteMin) this.minute = this._defaults.minuteMin; + if(this.second < this._defaults.secondMin) this.second = this._defaults.secondMin; + }else{ + this._defaults.hourMin = this.hourMinOriginal; + this._defaults.minuteMin = this.minuteMinOriginal; + this._defaults.secondMin = this.secondMinOriginal; + } + } + + if(this._defaults.maxDateTime !== null && dp_date){ + var maxDateTime = this._defaults.maxDateTime, + maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0); + + if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){ + this.hourMaxOriginal = o.hourMax; + this.minuteMaxOriginal = o.minuteMax; + this.secondMaxOriginal = o.secondMax; + } + + if(maxDateTimeDate.getTime() == dp_date.getTime()){ + this._defaults.hourMax = maxDateTime.getHours(); + this._defaults.minuteMax = maxDateTime.getMinutes(); + this._defaults.secondMax = maxDateTime.getSeconds(); + + if(this.hour > this._defaults.hourMax){ this.hour = this._defaults.hourMax; } + if(this.minute > this._defaults.minuteMax) this.minute = this._defaults.minuteMax; + if(this.second > this._defaults.secondMax) this.second = this._defaults.secondMax; + }else{ + this._defaults.hourMax = this.hourMaxOriginal; + this._defaults.minuteMax = this.minuteMaxOriginal; + this._defaults.secondMax = this.secondMaxOriginal; + } + } + + if(adjustSliders !== undefined && adjustSliders === true){ + this.hour_slider.slider("option", { min: this._defaults.hourMin, max: this._defaults.hourMax }).slider('value', this.hour); + this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: this._defaults.minuteMax }).slider('value', this.minute); + this.second_slider.slider("option", { min: this._defaults.secondMin, max: this._defaults.secondMax }).slider('value', this.second); + } + + }, + + //######################################################################## + // when a slider moves, set the internal time... + // on time change is also called when the time is updated in the text field + //######################################################################## + _onTimeChange: function() { + var hour = (this.hour_slider) ? this.hour_slider.slider('value') : false, + minute = (this.minute_slider) ? this.minute_slider.slider('value') : false, + second = (this.second_slider) ? this.second_slider.slider('value') : false; + + if (hour !== false) hour = parseInt(hour,10); + if (minute !== false) minute = parseInt(minute,10); + if (second !== false) second = parseInt(second,10); + + var ampm = (hour < 12) ? 'AM' : 'PM'; + + // If the update was done in the input field, the input field should not be updated. + // If the update was done using the sliders, update the input field. + var hasChanged = (hour != this.hour || minute != this.minute || second != this.second || (this.ampm.length > 0 && this.ampm != ampm)); + + if (hasChanged) { + + if (hour !== false)this.hour = hour; + if (minute !== false) this.minute = minute; + if (second !== false) this.second = second; + } + if (this._defaults.ampm) this.ampm = ampm; + + this._formatTime(); + if (this.$timeObj) this.$timeObj.text(this.formattedTime); + this.timeDefined = true; + if (hasChanged) this._updateDateTime(); + }, + + //######################################################################## + // format the time all pretty... + //######################################################################## + _formatTime: function(time, format, ampm) { + if (ampm == undefined) ampm = this._defaults.ampm; + time = time || { hour: this.hour, minute: this.minute, second: this.second, ampm: this.ampm }; + var tmptime = format || this._defaults.timeFormat.toString(); + + if (ampm) { + var hour12 = ((time.ampm == 'AM') ? (time.hour) : (time.hour % 12)); + hour12 = (Number(hour12) === 0) ? 12 : hour12; + tmptime = tmptime.toString() + .replace(/hh/g, ((hour12 < 10) ? '0' : '') + hour12) + .replace(/h/g, hour12) + .replace(/mm/g, ((time.minute < 10) ? '0' : '') + time.minute) + .replace(/m/g, time.minute) + .replace(/ss/g, ((time.second < 10) ? '0' : '') + time.second) + .replace(/s/g, time.second) + .replace(/TT/g, time.ampm.toUpperCase()) + .replace(/tt/g, time.ampm.toLowerCase()) + .replace(/T/g, time.ampm.charAt(0).toUpperCase()) + .replace(/t/g, time.ampm.charAt(0).toLowerCase()); + } else { + tmptime = tmptime.toString() + .replace(/hh/g, ((time.hour < 10) ? '0' : '') + time.hour) + .replace(/h/g, time.hour) + .replace(/mm/g, ((time.minute < 10) ? '0' : '') + time.minute) + .replace(/m/g, time.minute) + .replace(/ss/g, ((time.second < 10) ? '0' : '') + time.second) + .replace(/s/g, time.second); + tmptime = $.trim(tmptime.replace(/t/gi, '')); + } + + if (arguments.length) return tmptime; + else this.formattedTime = tmptime; + }, + + //######################################################################## + // update our input with the new date time.. + //######################################################################## + _updateDateTime: function(dp_inst) { + dp_inst = this.inst || dp_inst, + dt = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay), + dateFmt = $.datepicker._get(dp_inst, 'dateFormat'), + formatCfg = $.datepicker._getFormatConfig(dp_inst), + timeAvailable = dt !== null && this.timeDefined; + this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg); + var formattedDateTime = this.formattedDate; + if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) + return; + + if (this._defaults.timeOnly === true) { + formattedDateTime = this.formattedTime; + } else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) { + formattedDateTime += this._defaults.separator + this.formattedTime; + } + + this.formattedDateTime = formattedDateTime; + + if(!this._defaults.showTimepicker) { + this.$input.val(this.formattedDate); + } else if (this.$altInput && this._defaults.altFieldTimeOnly === true) { + this.$altInput.val(this.formattedTime); + this.$input.val(this.formattedDate); + } else if(this.$altInput) { + this.$altInput.val(formattedDateTime); + this.$input.val(formattedDateTime); + } else { + this.$input.val(formattedDateTime); + } + + this.$input.trigger("change"); + } + +}); + +$.fn.extend({ + //######################################################################## + // shorthand just to use timepicker.. + //######################################################################## + timepicker: function(o) { + o = o || {}; + var tmp_args = arguments; + + if (typeof o == 'object') tmp_args[0] = $.extend(o, { timeOnly: true }); + + return $(this).each(function() { + $.fn.datetimepicker.apply($(this), tmp_args); + }); + }, + + //######################################################################## + // extend timepicker to datepicker + //######################################################################## + datetimepicker: function(o) { + o = o || {}; + var $input = this, + tmp_args = arguments; + + if (typeof(o) == 'string'){ + if(o == 'getDate') + return $.fn.datepicker.apply($(this[0]), tmp_args); + else + return this.each(function() { + var $t = $(this); + $t.datepicker.apply($t, tmp_args); + }); + } + else + return this.each(function() { + var $t = $(this); + $t.datepicker($.timepicker._newInst($t, o)._defaults); + }); + } +}); + +//######################################################################## +// the bad hack :/ override datepicker so it doesnt close on select +// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378 +//######################################################################## +$.datepicker._base_selectDate = $.datepicker._selectDate; +$.datepicker._selectDate = function (id, dateStr) { + var inst = this._getInst($(id)[0]), + tp_inst = this._get(inst, 'timepicker'); + + if (tp_inst) { + tp_inst._limitMinMaxDateTime(inst, true); + inst.inline = inst.stay_open = true; + //This way the onSelect handler called from calendarpicker get the full dateTime + this._base_selectDate(id, dateStr + tp_inst._defaults.separator + tp_inst.formattedTime); + inst.inline = inst.stay_open = false; + this._notifyChange(inst); + this._updateDatepicker(inst); + } + else this._base_selectDate(id, dateStr); +}; + +//############################################################################################# +// second bad hack :/ override datepicker so it triggers an event when changing the input field +// and does not redraw the datepicker on every selectDate event +//############################################################################################# +$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker; +$.datepicker._updateDatepicker = function(inst) { + if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) { + + this._base_updateDatepicker(inst); + + // Reload the time control when changing something in the input text field. + var tp_inst = this._get(inst, 'timepicker'); + if(tp_inst) tp_inst._addTimePicker(inst); + } +}; + +//####################################################################################### +// third bad hack :/ override datepicker so it allows spaces and colan in the input field +//####################################################################################### +$.datepicker._base_doKeyPress = $.datepicker._doKeyPress; +$.datepicker._doKeyPress = function(event) { + var inst = $.datepicker._getInst(event.target), + tp_inst = $.datepicker._get(inst, 'timepicker'); + + if (tp_inst) { + if ($.datepicker._get(inst, 'constrainInput')) { + var ampm = tp_inst._defaults.ampm, + datetimeChars = tp_inst._defaults.timeFormat.toString() + .replace(/[hms]/g, '') + .replace(/TT/g, ampm ? 'APM' : '') + .replace(/T/g, ampm ? 'AP' : '') + .replace(/tt/g, ampm ? 'apm' : '') + .replace(/t/g, ampm ? 'ap' : '') + + " " + + tp_inst._defaults.separator + + $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')), + chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode); + return event.ctrlKey || (chr < ' ' || !datetimeChars || datetimeChars.indexOf(chr) > -1); + } + } + + return $.datepicker._base_doKeyPress(event); +}; + +//####################################################################################### +// Override key up event to sync manual input changes. +//####################################################################################### +$.datepicker._base_doKeyUp = $.datepicker._doKeyUp; +$.datepicker._doKeyUp = function (event) { + var inst = $.datepicker._getInst(event.target), + tp_inst = $.datepicker._get(inst, 'timepicker'); + + if (tp_inst) { + if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) { + try { + $.datepicker._updateDatepicker(inst); + } + catch (err) { + $.datepicker.log(err); + } + } + } + + return $.datepicker._base_doKeyUp(event); +}; + +//####################################################################################### +// override "Today" button to also grab the time. +//####################################################################################### +$.datepicker._base_gotoToday = $.datepicker._gotoToday; +$.datepicker._gotoToday = function(id) { + this._base_gotoToday(id); + this._setTime(this._getInst($(id)[0]), new Date()); +}; + +//####################################################################################### +// Disable & enable the Time in the datetimepicker +//####################################################################################### +$.datepicker._disableTimepickerDatepicker = function(target, date, withDate) { + var inst = this._getInst(target), + tp_inst = this._get(inst, 'timepicker'); + if (tp_inst) { + tp_inst._defaults.showTimepicker = false; + tp_inst._onTimeChange(); + tp_inst._updateDateTime(inst); + } +}; + +$.datepicker._enableTimepickerDatepicker = function(target, date, withDate) { + var inst = this._getInst(target), + tp_inst = this._get(inst, 'timepicker'); + if (tp_inst) { + tp_inst._defaults.showTimepicker = true; + tp_inst._onTimeChange(); + tp_inst._updateDateTime(inst); + } +}; + +//####################################################################################### +// Create our own set time function +//####################################################################################### +$.datepicker._setTime = function(inst, date) { + var tp_inst = this._get(inst, 'timepicker'); + if (tp_inst) { + var defaults = tp_inst._defaults, + // calling _setTime with no date sets time to defaults + hour = date ? date.getHours() : defaults.hour, + minute = date ? date.getMinutes() : defaults.minute, + second = date ? date.getSeconds() : defaults.second; + + //check if within min/max times.. + if ((hour < defaults.hourMin || hour > defaults.hourMax) || (minute < defaults.minuteMin || minute > defaults.minuteMax) || (second < defaults.secondMin || second > defaults.secondMax)) { + hour = defaults.hourMin; + minute = defaults.minuteMin; + second = defaults.secondMin; + } + + if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour); + else tp_inst.hour = hour; + if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute); + else tp_inst.minute = minute; + if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second); + else tp_inst.second = second; + + tp_inst._onTimeChange(); + tp_inst._updateDateTime(inst); + } +}; + +//####################################################################################### +// Create new public method to set only time, callable as $().datepicker('setTime', date) +//####################################################################################### +$.datepicker._setTimeDatepicker = function(target, date, withDate) { + var inst = this._getInst(target), + tp_inst = this._get(inst, 'timepicker'); + + if (tp_inst) { + this._setDateFromField(inst); + var tp_date; + if (date) { + if (typeof date == "string") { + tp_inst._parseTime(date, withDate); + tp_date = new Date(); + tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second); + } + else tp_date = new Date(date.getTime()); + if (tp_date.toString() == 'Invalid Date') tp_date = undefined; + } + this._setTime(inst, tp_date); + } + +}; + +//####################################################################################### +// override setDate() to allow setting time too within Date object +//####################################################################################### +$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker; +$.datepicker._setDateDatepicker = function(target, date) { + var inst = this._getInst(target), + tp_date = (date instanceof Date) ? new Date(date.getTime()) : date; + + this._updateDatepicker(inst); + this._base_setDateDatepicker.apply(this, arguments); + this._setTimeDatepicker(target, tp_date, true); +}; + +//####################################################################################### +// override getDate() to allow getting time too within Date object +//####################################################################################### +$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker; +$.datepicker._getDateDatepicker = function(target, noDefault) { + var inst = this._getInst(target), + tp_inst = this._get(inst, 'timepicker'); + + if (tp_inst) { + this._setDateFromField(inst, noDefault); + var date = this._getDate(inst); + if (date && tp_inst._parseTime($(target).val(), true)) date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second); + return date; + } + return this._base_getDateDatepicker(target, noDefault); +}; + +//####################################################################################### +// jQuery extend now ignores nulls! +//####################################################################################### +function extendRemove(target, props) { + $.extend(target, props); + for (var name in props) + if (props[name] === null || props[name] === undefined) + target[name] = props[name]; + return target; +} + +$.timepicker = new Timepicker(); // singleton instance +$.timepicker.version = "0.9.3"; + +})(jQuery); Propchange: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.js ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.js ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.js ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js?rev=1069542&view=auto ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js (added) +++ ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js Thu Feb 10 19:45:22 2011 @@ -0,0 +1,577 @@ +(function($){ +$.extend($.ui,{timepicker:{version:"0.9.3"}}); +function _1(){ +this.regional=[]; +this.regional[""]={currentText:"Now",closeText:"Done",ampm:false,timeFormat:"hh:mm tt",timeOnlyTitle:"Choose Time",timeText:"Time",hourText:"Hour",minuteText:"Minute",secondText:"Second"}; +this._defaults={showButtonPanel:true,timeOnly:false,showHour:true,showMinute:true,showSecond:false,showTime:true,stepHour:0.05,stepMinute:0.05,stepSecond:0.05,hour:0,minute:0,second:0,hourMin:0,minuteMin:0,secondMin:0,hourMax:23,minuteMax:59,secondMax:59,minDateTime:null,maxDateTime:null,hourGrid:0,minuteGrid:0,secondGrid:0,alwaysSetTime:true,separator:" ",altFieldTimeOnly:true,showTimepicker:true}; +$.extend(this._defaults,this.regional[""]); +}; +$.extend(_1.prototype,{$input:null,$altInput:null,$timeObj:null,inst:null,hour_slider:null,minute_slider:null,second_slider:null,hour:0,minute:0,second:0,hourMinOriginal:null,minuteMinOriginal:null,secondMinOriginal:null,hourMaxOriginal:null,minuteMaxOriginal:null,secondMaxOriginal:null,ampm:"",formattedDate:"",formattedTime:"",formattedDateTime:"",setDefaults:function(_2){ +_3(this._defaults,_2||{}); +return this; +},_newInst:function(_4,o){ +var _5=new _1(),_6={}; +_5.hour=_5._defaults.hour; +_5.minute=_5._defaults.minute; +_5.second=_5._defaults.second; +_5.ampm=""; +_5.$input=_4; +for(var _7 in this._defaults){ +var _8=_4.attr("time:"+_7); +if(_8){ +try{ +_6[_7]=eval(_8); +} +catch(err){ +_6[_7]=_8; +} +} +} +_5._defaults=$.extend({},this._defaults,_6,o,{beforeShow:function(_9,_a){ +var _b=new Date(); +_5.hour=_5._defaults.hour===0?_b.getHours():_5._defaults.hour; +_5.minute=_5._defaults.minute===0?_b.getMinutes():_5._defaults.minute; +_5.second=_5._defaults.second===0?_b.getSeconds():_5._defaults.second; +if($.isFunction(o.beforeShow)){ +o.beforeShow(_9,_a,_5); +} +},onChangeMonthYear:function(_c,_d,_e){ +_5._updateDateTime(_e); +if($.isFunction(o.onChangeMonthYear)){ +o.onChangeMonthYear(_c,_d,_e,_5); +} +},onClose:function(_f,_10){ +if(_5.timeDefined===true&&_4.val()!=""){ +_5._updateDateTime(_10); +} +if($.isFunction(o.onClose)){ +o.onClose(_f,_10,_5); +} +},timepicker:_5}); +if(o.altField){ +_5.$altInput=$(o.altField).css({cursor:"pointer"}).focus(function(){ +_4.trigger("focus"); +}); +} +if(_5._defaults.minDate!==undefined&&_5._defaults.minDate instanceof Date){ +_5._defaults.minDateTime=new Date(_5._defaults.minDate.getTime()); +} +if(_5._defaults.minDateTime!==undefined&&_5._defaults.minDateTime instanceof Date){ +_5._defaults.minDate=new Date(_5._defaults.minDateTime.getTime()); +} +if(_5._defaults.maxDate!==undefined&&_5._defaults.maxDate instanceof Date){ +_5._defaults.maxDateTime=new Date(_5._defaults.maxDate.getTime()); +} +if(_5._defaults.maxDateTime!==undefined&&_5._defaults.maxDateTime instanceof Date){ +_5._defaults.maxDate=new Date(_5._defaults.maxDateTime.getTime()); +} +return _5; +},_addTimePicker:function(_11){ +var _12=(this.$altInput&&this._defaults.altFieldTimeOnly)?this.$input.val()+" "+this.$altInput.val():this.$input.val(); +this.timeDefined=this._parseTime(_12); +this._limitMinMaxDateTime(_11,false); +this._injectTimePicker(); +},_parseTime:function(_13,_14){ +var _15=this._defaults.timeFormat.toString().replace(/h{1,2}/ig,"(\\d?\\d)").replace(/m{1,2}/ig,"(\\d?\\d)").replace(/s{1,2}/ig,"(\\d?\\d)").replace(/t{1,2}/ig,"(am|pm|a|p)?").replace(/\s/g,"\\s?")+"$",_16=this._getFormatPositions(),_17; +if(!this.inst){ +this.inst=$.datepicker._getInst(this.$input[0]); +} +if(_14||!this._defaults.timeOnly){ +var _18=$.datepicker._get(this.inst,"dateFormat"); +_15=".{"+_18.length+",}"+this._defaults.separator+_15; +} +_17=_13.match(new RegExp(_15,"i")); +if(_17){ +if(_16.t!==-1){ +this.ampm=((_17[_16.t]===undefined||_17[_16.t].length===0)?"":(_17[_16.t].charAt(0).toUpperCase()=="A")?"AM":"PM").toUpperCase(); +} +if(_16.h!==-1){ +if(this.ampm=="AM"&&_17[_16.h]=="12"){ +this.hour=0; +}else{ +if(this.ampm=="PM"&&_17[_16.h]!="12"){ +this.hour=(parseFloat(_17[_16.h])+12).toFixed(0); +}else{ +this.hour=Number(_17[_16.h]); +} +} +} +if(_16.m!==-1){ +this.minute=Number(_17[_16.m]); +} +if(_16.s!==-1){ +this.second=Number(_17[_16.s]); +} +return true; +} +return false; +},_getFormatPositions:function(){ +var _19=this._defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|t{1,2})/g),_1a={h:-1,m:-1,s:-1,t:-1}; +if(_19){ +for(var i=0;i<_19.length;i++){ +if(_1a[_19[i].toString().charAt(0)]==-1){ +_1a[_19[i].toString().charAt(0)]=i+1; +} +} +} +return _1a; +},_injectTimePicker:function(){ +var $dp=this.inst.dpDiv,o=this._defaults,_1b=this,_1c=(o.hourMax-(o.hourMax%o.stepHour)).toFixed(0),_1d=(o.minuteMax-(o.minuteMax%o.stepMinute)).toFixed(0),_1e=(o.secondMax-(o.secondMax%o.stepSecond)).toFixed(0),_1f=this.inst.id.toString().replace(/([^A-Za-z0-9_])/g,""); +if($dp.find("div#ui-timepicker-div-"+_1f).length===0&&o.showTimepicker){ +var _20=" style=\"display:none;\"",_21="<div class=\"ui-timepicker-div\" id=\"ui-timepicker-div-"+_1f+"\"><dl>"+"<dt class=\"ui_tpicker_time_label\" id=\"ui_tpicker_time_label_"+_1f+"\""+((o.showTime)?"":_20)+">"+o.timeText+"</dt>"+"<dd class=\"ui_tpicker_time\" id=\"ui_tpicker_time_"+_1f+"\""+((o.showTime)?"":_20)+"></dd>"+"<dt class=\"ui_tpicker_hour_label\" id=\"ui_tpicker_hour_label_"+_1f+"\""+((o.showHour)?"":_20)+">"+o.hourText+"</dt>",_22=0,_23=0,_24=0,_25; +if(o.showHour&&o.hourGrid>0){ +_21+="<dd class=\"ui_tpicker_hour\">"+"<div id=\"ui_tpicker_hour_"+_1f+"\""+((o.showHour)?"":_20)+"></div>"+"<div style=\"padding-left: 1px\"><table><tr>"; +for(var h=o.hourMin;h<_1c;h+=o.hourGrid){ +_22++; +var _26=(o.ampm&&h>12)?h-12:h; +if(_26<10){ +_26="0"+_26; +} +if(o.ampm){ +if(h==0){ +_26=12+"a"; +}else{ +if(h<12){ +_26+="a"; +}else{ +_26+="p"; +} +} +} +_21+="<td>"+_26+"</td>"; +} +_21+="</tr></table></div>"+"</dd>"; +}else{ +_21+="<dd class=\"ui_tpicker_hour\" id=\"ui_tpicker_hour_"+_1f+"\""+((o.showHour)?"":_20)+"></dd>"; +} +_21+="<dt class=\"ui_tpicker_minute_label\" id=\"ui_tpicker_minute_label_"+_1f+"\""+((o.showMinute)?"":_20)+">"+o.minuteText+"</dt>"; +if(o.showMinute&&o.minuteGrid>0){ +_21+="<dd class=\"ui_tpicker_minute ui_tpicker_minute_"+o.minuteGrid+"\">"+"<div id=\"ui_tpicker_minute_"+_1f+"\""+((o.showMinute)?"":_20)+"></div>"+"<div style=\"padding-left: 1px\"><table><tr>"; +for(var m=o.minuteMin;m<_1d;m+=o.minuteGrid){ +_23++; +_21+="<td>"+((m<10)?"0":"")+m+"</td>"; +} +_21+="</tr></table></div>"+"</dd>"; +}else{ +_21+="<dd class=\"ui_tpicker_minute\" id=\"ui_tpicker_minute_"+_1f+"\""+((o.showMinute)?"":_20)+"></dd>"; +} +_21+="<dt class=\"ui_tpicker_second_label\" id=\"ui_tpicker_second_label_"+_1f+"\""+((o.showSecond)?"":_20)+">"+o.secondText+"</dt>"; +if(o.showSecond&&o.secondGrid>0){ +_21+="<dd class=\"ui_tpicker_second ui_tpicker_second_"+o.secondGrid+"\">"+"<div id=\"ui_tpicker_second_"+_1f+"\""+((o.showSecond)?"":_20)+"></div>"+"<div style=\"padding-left: 1px\"><table><tr>"; +for(var s=o.secondMin;s<_1e;s+=o.secondGrid){ +_24++; +_21+="<td>"+((s<10)?"0":"")+s+"</td>"; +} +_21+="</tr></table></div>"+"</dd>"; +}else{ +_21+="<dd class=\"ui_tpicker_second\" id=\"ui_tpicker_second_"+_1f+"\""+((o.showSecond)?"":_20)+"></dd>"; +} +_21+="</dl></div>"; +$tp=$(_21); +if(o.timeOnly===true){ +$tp.prepend("<div class=\"ui-widget-header ui-helper-clearfix ui-corner-all\">"+"<div class=\"ui-datepicker-title\">"+o.timeOnlyTitle+"</div>"+"</div>"); +$dp.find(".ui-datepicker-header, .ui-datepicker-calendar").hide(); +} +this.hour_slider=$tp.find("#ui_tpicker_hour_"+_1f).slider({orientation:"horizontal",value:this.hour,min:o.hourMin,max:_1c,step:o.stepHour,slide:function(_27,ui){ +_1b.hour_slider.slider("option","value",ui.value); +_1b._onTimeChange(); +}}); +this.minute_slider=$tp.find("#ui_tpicker_minute_"+_1f).slider({orientation:"horizontal",value:this.minute,min:o.minuteMin,max:_1d,step:o.stepMinute,slide:function(_28,ui){ +_1b.minute_slider.slider("option","value",ui.value); +_1b._onTimeChange(); +}}); +this.second_slider=$tp.find("#ui_tpicker_second_"+_1f).slider({orientation:"horizontal",value:this.second,min:o.secondMin,max:_1e,step:o.stepSecond,slide:function(_29,ui){ +_1b.second_slider.slider("option","value",ui.value); +_1b._onTimeChange(); +}}); +if(o.showHour&&o.hourGrid>0){ +_25=100*_22*o.hourGrid/(_1c-o.hourMin); +$tp.find(".ui_tpicker_hour table").css({width:_25+"%",marginLeft:(_25/(-2*_22))+"%",borderCollapse:"collapse"}).find("td").each(function(_2a){ +$(this).click(function(){ +var h=$(this).html(); +if(o.ampm){ +var ap=h.substring(2).toLowerCase(),aph=parseInt(h.substring(0,2)); +if(ap=="a"){ +if(aph==12){ +h=0; +}else{ +h=aph; +} +}else{ +if(aph==12){ +h=12; +}else{ +h=aph+12; +} +} +} +_1b.hour_slider.slider("option","value",h); +_1b._onTimeChange(); +}).css({cursor:"pointer",width:(100/_22)+"%",textAlign:"center",overflow:"hidden"}); +}); +} +if(o.showMinute&&o.minuteGrid>0){ +_25=100*_23*o.minuteGrid/(_1d-o.minuteMin); +$tp.find(".ui_tpicker_minute table").css({width:_25+"%",marginLeft:(_25/(-2*_23))+"%",borderCollapse:"collapse"}).find("td").each(function(_2b){ +$(this).click(function(){ +_1b.minute_slider.slider("option","value",$(this).html()); +_1b._onTimeChange(); +}).css({cursor:"pointer",width:(100/_23)+"%",textAlign:"center",overflow:"hidden"}); +}); +} +if(o.showSecond&&o.secondGrid>0){ +$tp.find(".ui_tpicker_second table").css({width:_25+"%",marginLeft:(_25/(-2*_24))+"%",borderCollapse:"collapse"}).find("td").each(function(_2c){ +$(this).click(function(){ +_1b.second_slider.slider("option","value",$(this).html()); +_1b._onTimeChange(); +}).css({cursor:"pointer",width:(100/_24)+"%",textAlign:"center",overflow:"hidden"}); +}); +} +var _2d=$dp.find(".ui-datepicker-buttonpane"); +if(_2d.length){ +_2d.before($tp); +}else{ +$dp.append($tp); +} +this.$timeObj=$("#ui_tpicker_time_"+_1f); +if(this.inst!==null){ +var _2e=this.timeDefined; +this._onTimeChange(); +this.timeDefined=_2e; +} +var _2f=_1b._defaults["onSelect"]; +if(_2f){ +var _30=_1b.$input?_1b.$input[0]:null; +var _31=function(){ +_2f.apply(_30,[_1b.formattedDateTime,_1b]); +}; +this.hour_slider.bind("slidestop",_31); +this.minute_slider.bind("slidestop",_31); +this.second_slider.bind("slidestop",_31); +} +} +},_limitMinMaxDateTime:function(_32,_33){ +var o=this._defaults,_34=new Date(_32.selectedYear,_32.selectedMonth,_32.selectedDay),_35=new Date(_32.selectedYear,_32.selectedMonth,_32.selectedDay,this.hour,this.minute,this.second,0); +if(this._defaults.minDateTime!==null&&_34){ +var _36=this._defaults.minDateTime,_37=new Date(_36.getFullYear(),_36.getMonth(),_36.getDate(),0,0,0,0); +if(this.hourMinOriginal===null||this.minuteMinOriginal===null||this.secondMinOriginal===null){ +this.hourMinOriginal=o.hourMin; +this.minuteMinOriginal=o.minuteMin; +this.secondMinOriginal=o.secondMin; +} +if(_37.getTime()==_34.getTime()){ +this._defaults.hourMin=_36.getHours(); +this._defaults.minuteMin=_36.getMinutes(); +this._defaults.secondMin=_36.getSeconds(); +if(this.hour<this._defaults.hourMin){ +this.hour=this._defaults.hourMin; +} +if(this.minute<this._defaults.minuteMin){ +this.minute=this._defaults.minuteMin; +} +if(this.second<this._defaults.secondMin){ +this.second=this._defaults.secondMin; +} +}else{ +this._defaults.hourMin=this.hourMinOriginal; +this._defaults.minuteMin=this.minuteMinOriginal; +this._defaults.secondMin=this.secondMinOriginal; +} +} +if(this._defaults.maxDateTime!==null&&_34){ +var _38=this._defaults.maxDateTime,_39=new Date(_38.getFullYear(),_38.getMonth(),_38.getDate(),0,0,0,0); +if(this.hourMaxOriginal===null||this.minuteMaxOriginal===null||this.secondMaxOriginal===null){ +this.hourMaxOriginal=o.hourMax; +this.minuteMaxOriginal=o.minuteMax; +this.secondMaxOriginal=o.secondMax; +} +if(_39.getTime()==_34.getTime()){ +this._defaults.hourMax=_38.getHours(); +this._defaults.minuteMax=_38.getMinutes(); +this._defaults.secondMax=_38.getSeconds(); +if(this.hour>this._defaults.hourMax){ +this.hour=this._defaults.hourMax; +} +if(this.minute>this._defaults.minuteMax){ +this.minute=this._defaults.minuteMax; +} +if(this.second>this._defaults.secondMax){ +this.second=this._defaults.secondMax; +} +}else{ +this._defaults.hourMax=this.hourMaxOriginal; +this._defaults.minuteMax=this.minuteMaxOriginal; +this._defaults.secondMax=this.secondMaxOriginal; +} +} +if(_33!==undefined&&_33===true){ +this.hour_slider.slider("option",{min:this._defaults.hourMin,max:this._defaults.hourMax}).slider("value",this.hour); +this.minute_slider.slider("option",{min:this._defaults.minuteMin,max:this._defaults.minuteMax}).slider("value",this.minute); +this.second_slider.slider("option",{min:this._defaults.secondMin,max:this._defaults.secondMax}).slider("value",this.second); +} +},_onTimeChange:function(){ +var _3a=(this.hour_slider)?this.hour_slider.slider("value"):false,_3b=(this.minute_slider)?this.minute_slider.slider("value"):false,_3c=(this.second_slider)?this.second_slider.slider("value"):false; +if(_3a!==false){ +_3a=parseInt(_3a,10); +} +if(_3b!==false){ +_3b=parseInt(_3b,10); +} +if(_3c!==false){ +_3c=parseInt(_3c,10); +} +var _3d=(_3a<12)?"AM":"PM"; +var _3e=(_3a!=this.hour||_3b!=this.minute||_3c!=this.second||(this.ampm.length>0&&this.ampm!=_3d)); +if(_3e){ +if(_3a!==false){ +this.hour=_3a; +} +if(_3b!==false){ +this.minute=_3b; +} +if(_3c!==false){ +this.second=_3c; +} +} +if(this._defaults.ampm){ +this.ampm=_3d; +} +this._formatTime(); +if(this.$timeObj){ +this.$timeObj.text(this.formattedTime); +} +this.timeDefined=true; +if(_3e){ +this._updateDateTime(); +} +},_formatTime:function(_3f,_40,_41){ +if(_41==undefined){ +_41=this._defaults.ampm; +} +_3f=_3f||{hour:this.hour,minute:this.minute,second:this.second,ampm:this.ampm}; +var _42=_40||this._defaults.timeFormat.toString(); +if(_41){ +var _43=((_3f.ampm=="AM")?(_3f.hour):(_3f.hour%12)); +_43=(Number(_43)===0)?12:_43; +_42=_42.toString().replace(/hh/g,((_43<10)?"0":"")+_43).replace(/h/g,_43).replace(/mm/g,((_3f.minute<10)?"0":"")+_3f.minute).replace(/m/g,_3f.minute).replace(/ss/g,((_3f.second<10)?"0":"")+_3f.second).replace(/s/g,_3f.second).replace(/TT/g,_3f.ampm.toUpperCase()).replace(/tt/g,_3f.ampm.toLowerCase()).replace(/T/g,_3f.ampm.charAt(0).toUpperCase()).replace(/t/g,_3f.ampm.charAt(0).toLowerCase()); +}else{ +_42=_42.toString().replace(/hh/g,((_3f.hour<10)?"0":"")+_3f.hour).replace(/h/g,_3f.hour).replace(/mm/g,((_3f.minute<10)?"0":"")+_3f.minute).replace(/m/g,_3f.minute).replace(/ss/g,((_3f.second<10)?"0":"")+_3f.second).replace(/s/g,_3f.second); +_42=$.trim(_42.replace(/t/gi,"")); +} +if(arguments.length){ +return _42; +}else{ +this.formattedTime=_42; +} +},_updateDateTime:function(_44){ +_44=this.inst||_44,dt=new Date(_44.selectedYear,_44.selectedMonth,_44.selectedDay),dateFmt=$.datepicker._get(_44,"dateFormat"),formatCfg=$.datepicker._getFormatConfig(_44),timeAvailable=dt!==null&&this.timeDefined; +this.formattedDate=$.datepicker.formatDate(dateFmt,(dt===null?new Date():dt),formatCfg); +var _45=this.formattedDate; +if(_44.lastVal!==undefined&&(_44.lastVal.length>0&&this.$input.val().length===0)){ +return; +} +if(this._defaults.timeOnly===true){ +_45=this.formattedTime; +}else{ +if(this._defaults.timeOnly!==true&&(this._defaults.alwaysSetTime||timeAvailable)){ +_45+=this._defaults.separator+this.formattedTime; +} +} +this.formattedDateTime=_45; +if(!this._defaults.showTimepicker){ +this.$input.val(this.formattedDate); +}else{ +if(this.$altInput&&this._defaults.altFieldTimeOnly===true){ +this.$altInput.val(this.formattedTime); +this.$input.val(this.formattedDate); +}else{ +if(this.$altInput){ +this.$altInput.val(_45); +this.$input.val(_45); +}else{ +this.$input.val(_45); +} +} +} +this.$input.trigger("change"); +}}); +$.fn.extend({timepicker:function(o){ +o=o||{}; +var _46=arguments; +if(typeof o=="object"){ +_46[0]=$.extend(o,{timeOnly:true}); +} +return $(this).each(function(){ +$.fn.datetimepicker.apply($(this),_46); +}); +},datetimepicker:function(o){ +o=o||{}; +var _47=this,_48=arguments; +if(typeof (o)=="string"){ +if(o=="getDate"){ +return $.fn.datepicker.apply($(this[0]),_48); +}else{ +return this.each(function(){ +var $t=$(this); +$t.datepicker.apply($t,_48); +}); +} +}else{ +return this.each(function(){ +var $t=$(this); +$t.datepicker($.timepicker._newInst($t,o)._defaults); +}); +} +}}); +$.datepicker._base_selectDate=$.datepicker._selectDate; +$.datepicker._selectDate=function(id,_49){ +var _4a=this._getInst($(id)[0]),_4b=this._get(_4a,"timepicker"); +if(_4b){ +_4b._limitMinMaxDateTime(_4a,true); +_4a.inline=_4a.stay_open=true; +this._base_selectDate(id,_49+_4b._defaults.separator+_4b.formattedTime); +_4a.inline=_4a.stay_open=false; +this._notifyChange(_4a); +this._updateDatepicker(_4a); +}else{ +this._base_selectDate(id,_49); +} +}; +$.datepicker._base_updateDatepicker=$.datepicker._updateDatepicker; +$.datepicker._updateDatepicker=function(_4c){ +if(typeof (_4c.stay_open)!=="boolean"||_4c.stay_open===false){ +this._base_updateDatepicker(_4c); +var _4d=this._get(_4c,"timepicker"); +if(_4d){ +_4d._addTimePicker(_4c); +} +} +}; +$.datepicker._base_doKeyPress=$.datepicker._doKeyPress; +$.datepicker._doKeyPress=function(_4e){ +var _4f=$.datepicker._getInst(_4e.target),_50=$.datepicker._get(_4f,"timepicker"); +if(_50){ +if($.datepicker._get(_4f,"constrainInput")){ +var _51=_50._defaults.ampm,_52=_50._defaults.timeFormat.toString().replace(/[hms]/g,"").replace(/TT/g,_51?"APM":"").replace(/T/g,_51?"AP":"").replace(/tt/g,_51?"apm":"").replace(/t/g,_51?"ap":"")+" "+_50._defaults.separator+$.datepicker._possibleChars($.datepicker._get(_4f,"dateFormat")),chr=String.fromCharCode(_4e.charCode===undefined?_4e.keyCode:_4e.charCode); +return _4e.ctrlKey||(chr<" "||!_52||_52.indexOf(chr)>-1); +} +} +return $.datepicker._base_doKeyPress(_4e); +}; +$.datepicker._base_doKeyUp=$.datepicker._doKeyUp; +$.datepicker._doKeyUp=function(_53){ +var _54=$.datepicker._getInst(_53.target),_55=$.datepicker._get(_54,"timepicker"); +if(_55){ +if(_55._defaults.timeOnly&&(_54.input.val()!=_54.lastVal)){ +try{ +$.datepicker._updateDatepicker(_54); +} +catch(err){ +$.datepicker.log(err); +} +} +} +return $.datepicker._base_doKeyUp(_53); +}; +$.datepicker._base_gotoToday=$.datepicker._gotoToday; +$.datepicker._gotoToday=function(id){ +this._base_gotoToday(id); +this._setTime(this._getInst($(id)[0]),new Date()); +}; +$.datepicker._disableTimepickerDatepicker=function(_56,_57,_58){ +var _59=this._getInst(_56),_5a=this._get(_59,"timepicker"); +if(_5a){ +_5a._defaults.showTimepicker=false; +_5a._onTimeChange(); +_5a._updateDateTime(_59); +} +}; +$.datepicker._enableTimepickerDatepicker=function(_5b,_5c,_5d){ +var _5e=this._getInst(_5b),_5f=this._get(_5e,"timepicker"); +if(_5f){ +_5f._defaults.showTimepicker=true; +_5f._onTimeChange(); +_5f._updateDateTime(_5e); +} +}; +$.datepicker._setTime=function(_60,_61){ +var _62=this._get(_60,"timepicker"); +if(_62){ +var _63=_62._defaults,_64=_61?_61.getHours():_63.hour,_65=_61?_61.getMinutes():_63.minute,_66=_61?_61.getSeconds():_63.second; +if((_64<_63.hourMin||_64>_63.hourMax)||(_65<_63.minuteMin||_65>_63.minuteMax)||(_66<_63.secondMin||_66>_63.secondMax)){ +_64=_63.hourMin; +_65=_63.minuteMin; +_66=_63.secondMin; +} +if(_62.hour_slider){ +_62.hour_slider.slider("value",_64); +}else{ +_62.hour=_64; +} +if(_62.minute_slider){ +_62.minute_slider.slider("value",_65); +}else{ +_62.minute=_65; +} +if(_62.second_slider){ +_62.second_slider.slider("value",_66); +}else{ +_62.second=_66; +} +_62._onTimeChange(); +_62._updateDateTime(_60); +} +}; +$.datepicker._setTimeDatepicker=function(_67,_68,_69){ +var _6a=this._getInst(_67),_6b=this._get(_6a,"timepicker"); +if(_6b){ +this._setDateFromField(_6a); +var _6c; +if(_68){ +if(typeof _68=="string"){ +_6b._parseTime(_68,_69); +_6c=new Date(); +_6c.setHours(_6b.hour,_6b.minute,_6b.second); +}else{ +_6c=new Date(_68.getTime()); +} +if(_6c.toString()=="Invalid Date"){ +_6c=undefined; +} +} +this._setTime(_6a,_6c); +} +}; +$.datepicker._base_setDateDatepicker=$.datepicker._setDateDatepicker; +$.datepicker._setDateDatepicker=function(_6d,_6e){ +var _6f=this._getInst(_6d),_70=(_6e instanceof Date)?new Date(_6e.getTime()):_6e; +this._updateDatepicker(_6f); +this._base_setDateDatepicker.apply(this,arguments); +this._setTimeDatepicker(_6d,_70,true); +}; +$.datepicker._base_getDateDatepicker=$.datepicker._getDateDatepicker; +$.datepicker._getDateDatepicker=function(_71,_72){ +var _73=this._getInst(_71),_74=this._get(_73,"timepicker"); +if(_74){ +this._setDateFromField(_73,_72); +var _75=this._getDate(_73); +if(_75&&_74._parseTime($(_71).val(),true)){ +_75.setHours(_74.hour,_74.minute,_74.second); +} +return _75; +} +return this._base_getDateDatepicker(_71,_72); +}; +function _3(_76,_77){ +$.extend(_76,_77); +for(var _78 in _77){ +if(_77[_78]===null||_77[_78]===undefined){ +_76[_78]=_77[_78]; +} +} +return _76; +}; +$.timepicker=new _1(); +$.timepicker.version="0.9.3"; +})(jQuery); + Propchange: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1069542&r1=1069541&r2=1069542&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Thu Feb 10 19:45:22 2011 @@ -42,7 +42,7 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.6.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> @@ -257,7 +257,7 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.6.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> Modified: ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml?rev=1069542&r1=1069541&r2=1069542&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml Thu Feb 10 19:45:22 2011 @@ -43,7 +43,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/fieldlookup.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/selectall.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.6.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |