diff --git a/bower.json b/bower.json index da93e59..4d06ef5 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "fcoo-maps", - "version": "1.31.14", + "version": "1.31.15", "homepage": "https://github.com/fcoo/fcoo-maps", "authors": [ "Niels Holt" diff --git a/demo/bower_components.css b/demo/bower_components.css index 7e069ce..07f907b 100644 --- a/demo/bower_components.css +++ b/demo/bower_components.css @@ -16616,6 +16616,18 @@ The scss is divided in two parts: First the common part equal for all types and /*************************************************************** COMMON STYLE ***************************************************************/ +.pre-line, .grid .grid-color.pre, .base-slider-container .line .line-color.pre { + left: -50%; + width: 50%; + background-color: rgba(0, 0, 0, 0.1); +} + +.post-line, .grid .grid-color.post, .base-slider-container .line .line-color.post { + left: 100%; + width: 50%; + background-color: rgba(0, 0, 0, 0.1); +} + .base-slider-container { position: relative; display: block; @@ -16628,6 +16640,9 @@ COMMON STYLE width: 100%; top: 0; } +.base-slider-container.fixed .line { + overflow: visible; +} .base-slider-container .line { position: relative; display: block; @@ -16649,6 +16664,14 @@ COMMON STYLE display: block; height: 100%; } +.base-slider-container .line .line-color.pre { + top: -1px; + border: 1px solid rgb(175, 179, 187); +} +.base-slider-container .line .line-color.post { + top: -1px; + border: 1px solid rgb(175, 179, 187); +} .base-slider-container .line .line-color:first-child { border-bottom-left-radius: 2px; border-top-left-radius: 2px; @@ -16781,7 +16804,6 @@ COMMON STYLE border-bottom-width: 4.5px; border-right: 9px solid black; } - .disabled { opacity: 0.4; } diff --git a/demo/bower_components.js b/demo/bower_components.js index ff6722a..74d15c7 100644 --- a/demo/bower_components.js +++ b/demo/bower_components.js @@ -10742,7 +10742,7 @@ return jQuery; ;(function(window, document, undefined){ var tests = []; - + /** * @@ -10791,7 +10791,7 @@ return jQuery; } }; - + // Fake some of Object.create so we can force non test results to be non "own" properties. var Modernizr = function() {}; @@ -10801,10 +10801,10 @@ return jQuery; // Overwrite name so constructor name is nicer :D Modernizr = new Modernizr(); - + var classes = []; - + /** * is returns a boolean if the typeof an obj is exactly type. @@ -10900,7 +10900,7 @@ return jQuery; */ var docElement = document.documentElement; - + /** * A convenience helper to check if the document we are running in is an SVG document @@ -10910,7 +10910,7 @@ return jQuery; */ var isSVG = docElement.nodeName.toLowerCase() === 'svg'; - + /** * setClasses takes an array of class names and adds them to the root element @@ -10978,7 +10978,7 @@ return jQuery; } })(); - + // _l tracks listeners for async tests, as well as tests that execute after the initial run @@ -11188,7 +11188,7 @@ return jQuery; ModernizrProto.addTest = addTest; }); - + /** @@ -11208,11 +11208,11 @@ return jQuery; */ var omPrefixes = 'Moz O ms Webkit'; - + var cssomPrefixes = (ModernizrProto._config.usePrefixes ? omPrefixes.split(' ') : []); ModernizrProto._cssomPrefixes = cssomPrefixes; - + /** * atRule returns a given CSS property at-rule (eg @keyframes), possibly in @@ -11279,7 +11279,7 @@ return jQuery; ModernizrProto.atRule = atRule; - + /** * createElement is a convenience wrapper around document.createElement. Since we @@ -11380,7 +11380,7 @@ return jQuery; ModernizrProto.hasEvent = hasEvent; - + /** * getBody returns the body of a document, or an element that can stand in for @@ -11553,7 +11553,7 @@ return jQuery; ModernizrProto.mq = mq; - + /** @@ -11587,7 +11587,7 @@ return jQuery; delete modElem.elem; }); - + var mStyle = { style: modElem.elem.style @@ -11599,7 +11599,7 @@ return jQuery; delete mStyle.style; }); - + /** * domToCSS takes a camelCase string and converts it to kebab-case @@ -11789,7 +11789,7 @@ return jQuery; var domPrefixes = (ModernizrProto._config.usePrefixes ? omPrefixes.toLowerCase().split(' ') : []); ModernizrProto._domPrefixes = domPrefixes; - + /** * fnBind is a super small [bind](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind) polyfill. @@ -11884,7 +11884,7 @@ return jQuery; // Modernizr.testAllProps('boxSizing') ModernizrProto.testAllProps = testPropsAll; - + /** * prefixed returns the prefixed or nonprefixed property name variant of your input @@ -11968,7 +11968,7 @@ return jQuery; } }; - + /*! { "name": "Fullscreen API", @@ -12027,7 +12027,7 @@ Detects support for the ability to make the current website take over the user's // expose these for the plugin API. Look in the source for how to join() them against your input ModernizrProto._prefixes = prefixes; - + /** * testStyles injects an element with style element and some CSS rules @@ -12087,7 +12087,7 @@ Detects support for the ability to make the current website take over the user's */ var testStyles = ModernizrProto.testStyles = injectElementWithStyles; - + /*! { "name": "Touch Events", @@ -12207,7 +12207,7 @@ This test will also return `true` for Firefox 4 Multitouch support. return testPropsAll(prop, undefined, undefined, value, skipValueTest); } ModernizrProto.testAllProps = testAllProps; - + /*! { "name": "Flexbox", @@ -12559,7 +12559,7 @@ else { ; /**************************************************************************** - modernizr-javascript.js, + modernizr-javascript.js, (c) 2016, FCOO @@ -12570,20 +12570,20 @@ else { (function ($, window, document, undefined) { "use strict"; - + var ns = window; //Extend the jQuery prototype $.fn.extend({ - modernizrOn : function( test ){ - return this.modernizrToggle( test, true ); + modernizrOn : function( test ){ + return this.modernizrToggle( test, true ); }, - modernizrOff: function( test ){ - return this.modernizrToggle( test, false ); + modernizrOff: function( test ){ + return this.modernizrToggle( test, false ); }, - - modernizrToggle: function( test, on ){ + + modernizrToggle: function( test, on ){ if ( on === undefined ) return this.modernizrToggle( test, !this.hasClass( test ) ); @@ -12624,13 +12624,13 @@ else { for (j=0; j=0; i-- ) if (func( this.events[eventName][i], i, this.events[eventName] )) break; - } + } else { for (i=0; i in and adding favicons ns.viewport_no_scalable = ns.viewport_no_scalable || false; ns.addApplicationMetaAndFavicon = function(owner = "fcoo", logo = 'fcoo'){ - var tagList = [ {'tag': 'meta', 'charset': "utf-8"}, {'tag': 'meta', 'http-equiv': 'x-dns-prefetch-control', 'content': 'on'}, @@ -42843,7 +42842,7 @@ Methods for creating in and adding favicons var keys = ['Hours', 'Minutes', 'Seconds', 'Milliseconds']; var maxValues = [24, 60, 60, 1000]; - + // Capitalize first letter key = key.charAt(0).toUpperCase() + key.slice(1).toLowerCase(); @@ -42890,19 +42889,19 @@ Methods for creating in and adding favicons ; /* @preserve * The MIT License (MIT) - * + * * Copyright (c) 2013-2018 Petka Antonov - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -42910,7 +42909,7 @@ Methods for creating in and adding favicons * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. - * + * */ /** * bluebird build version 3.7.2 @@ -46502,28 +46501,28 @@ _dereq_('./using.js')(Promise, apiRejection, tryConvertToPromise, createContext, _dereq_('./any.js')(Promise); _dereq_('./each.js')(Promise, INTERNAL); _dereq_('./filter.js')(Promise, INTERNAL); - - util.toFastProperties(Promise); - util.toFastProperties(Promise.prototype); - function fillTypes(value) { - var p = new Promise(INTERNAL); - p._fulfillmentHandler0 = value; - p._rejectionHandler0 = value; - p._promise0 = value; - p._receiver0 = value; - } - // Complete slack tracking, opt out of field-type tracking and - // stabilize map - fillTypes({a: 1}); - fillTypes({b: 2}); - fillTypes({c: 3}); - fillTypes(1); - fillTypes(function(){}); - fillTypes(undefined); - fillTypes(false); - fillTypes(new Promise(INTERNAL)); - debug.setBounds(Async.firstLineError, util.lastLineError); - return Promise; + + util.toFastProperties(Promise); + util.toFastProperties(Promise.prototype); + function fillTypes(value) { + var p = new Promise(INTERNAL); + p._fulfillmentHandler0 = value; + p._rejectionHandler0 = value; + p._promise0 = value; + p._receiver0 = value; + } + // Complete slack tracking, opt out of field-type tracking and + // stabilize map + fillTypes({a: 1}); + fillTypes({b: 2}); + fillTypes({c: 3}); + fillTypes(1); + fillTypes(function(){}); + fillTypes(undefined); + fillTypes(false); + fillTypes(new Promise(INTERNAL)); + debug.setBounds(Async.firstLineError, util.lastLineError); + return Promise; }; @@ -51661,11 +51660,11 @@ module.exports = Yaml; var minor = parseInt(splitVersion[1]); var JQ_LT_17 = (major < 1) || (major == 1 && minor < 7); - + function eventsData($el) { return JQ_LT_17 ? $el.data('events') : $._data($el[0]).events; } - + function moveHandlerToTop($el, eventName, isDelegated) { var data = eventsData($el); var events = data[eventName]; @@ -51683,7 +51682,7 @@ module.exports = Yaml; events.unshift(events.pop()); } } - + function moveEventHandlers($elems, eventsString, isDelegate) { var events = eventsString.split(/\s+/); $elems.each(function() { @@ -51693,7 +51692,7 @@ module.exports = Yaml; } }); } - + function makeMethod(methodName) { $.fn[methodName + 'First'] = function() { var args = $.makeArray(arguments); @@ -51718,7 +51717,7 @@ module.exports = Yaml; $.fn.delegateFirst = function() { var args = $.makeArray(arguments); var eventsString = args[1]; - + if (eventsString) { args.splice(0, 2); $.fn.delegate.apply(this, arguments); @@ -51738,7 +51737,7 @@ module.exports = Yaml; return this; }; - + // on (jquery >= 1.7) if (!JQ_LT_17) { $.fn.onFirst = function(types, selector) { @@ -60233,8 +60232,8 @@ module.exports = Yaml; }; (function(factory) { if (true) { - !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(2) ], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, - __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, + !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(2) ], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, + __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)); } else {} })(function(Inputmask) { @@ -60328,8 +60327,8 @@ module.exports = Yaml; }; (function(factory) { if (true) { - !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(3), __webpack_require__(5) ], - __WEBPACK_AMD_DEFINE_FACTORY__ = factory, __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, + !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(3), __webpack_require__(5) ], + __WEBPACK_AMD_DEFINE_FACTORY__ = factory, __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)); } else {} })(function($, window, undefined) { @@ -61842,7 +61841,7 @@ module.exports = Yaml; function seekPrevious(pos, newBlock) { var position = pos, tests; if (position <= 0) return 0; - while (--position > 0 && (newBlock === true && getTest(position).match.newBlockMarker !== true || newBlock !== true && !isMask(position) && (tests = getTests(position), + while (--position > 0 && (newBlock === true && getTest(position).match.newBlockMarker !== true || newBlock !== true && !isMask(position) && (tests = getTests(position), tests.length < 2 || tests.length === 2 && tests[1].match.def === ""))) {} return position; } @@ -63079,8 +63078,8 @@ module.exports = Yaml; }; (function(factory) { if (true) { - !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(4) ], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, - __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, + !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(4) ], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, + __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)); } else {} })(function($) { @@ -63109,8 +63108,8 @@ module.exports = Yaml; }; (function(factory) { if (true) { - !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(2) ], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, - __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, + !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(2) ], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, + __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)); } else {} })(function(Inputmask) { @@ -63361,8 +63360,8 @@ module.exports = Yaml; }; (function(factory) { if (true) { - !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(2) ], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, - __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, + !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(2) ], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, + __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)); } else {} })(function(Inputmask) { @@ -63912,8 +63911,8 @@ module.exports = Yaml; }; (function(factory) { if (true) { - !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(4), __webpack_require__(2) ], - __WEBPACK_AMD_DEFINE_FACTORY__ = factory, __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, + !(__WEBPACK_AMD_DEFINE_ARRAY__ = [ __webpack_require__(4), __webpack_require__(2) ], + __WEBPACK_AMD_DEFINE_FACTORY__ = factory, __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)); } else {} })(function($, Inputmask) { @@ -67557,6 +67556,9 @@ if (typeof define === 'function' && define.amd) { impactLineColors : {green: "green", yellow: "yellow", red: "red"}, //The line colors used when showImpactLineColor: true reverseImpactLineColor: false, // The line on a double slider is colored as red-[handle]-yellow-[handle]-green. Must have showImpactLineColor: true + //Extention of line-color and/or grid-color when the handle is fixed (handleFixed: true) + extendLine : true, //If true and showLine: true => show light gray line before and after the line + extendGridColors : true, //If true and grid-colors are given => show light gray line before and after the grid //Size sizeFactor: 1, //Factor to re-size default sizes @@ -67564,7 +67566,10 @@ if (typeof define === 'function' && define.amd) { borderWidth: 1, }, size: { - fontSize : 10, + fontSize : 10, + fontFamily: 'Arial', + fontWeight: '', + majorTickLength : 9, minorTickLength : 6, @@ -67572,9 +67577,8 @@ if (typeof define === 'function' && define.amd) { lineBorderRadius: 2, - textPadding : 2, + textPadding : 2 - labelInnerHeight: 10, }, //Grid (ticks and label) @@ -68091,12 +68095,12 @@ if (typeof define === 'function' && define.amd) { build: function () { var _this = this; //************************************** - function $span( className, $parent ){ + function $span( className, $parent, prepend ){ var result = $(''); if (className) result.addClass( className ); if ($parent) - result.appendTo( $parent ); + prepend ? result.prependTo( $parent ) : result.appendTo( $parent ); return result; } //************************************** @@ -68119,6 +68123,7 @@ if (typeof define === 'function' && define.amd) { //this.cache.$leftColorLine, this.cache.$centerColorLine, this.cache.$rightColorLine function appendLineColor( left, center, right ){ var result; + if (left) result = _this.cache.$leftLineColor = $span('line-color', _this.cache.$line); if (center) result = _this.cache.$centerLineColor = $span('line-color', _this.cache.$line); if (right) result = _this.cache.$rightLineColor = $span('line-color', _this.cache.$line); @@ -68157,6 +68162,12 @@ if (typeof define === 'function' && define.amd) { if (this.options.showLineColor) appendLineColor( this.options.isSingle, this.options.isDouble, false ) .css('background-color', this.options.lineColor); + + //For fixed slider: Add dim line before and after to have line in hole container + if (this.options.handleFixed && this.options.extendLine){ + $span('line-color pre' , _this.cache.$line, true); + $span('line-color post', _this.cache.$line); + } } else this.cache.$line.css("visibility", "hidden"); @@ -68391,7 +68402,7 @@ if (typeof define === 'function' && define.amd) { ctx.textBaseline = "top"; //"bottom" or "middle" or "alphabetic" or "hanging" ctx.strokeStyle = this.options.majorColor; - ctx.font = size.fontSize + 'px Arial'; + ctx.font = size.fontWeight + (size.fontWeight ? ' ' : '') + size.fontSize+'px ' + size.fontFamily; if (this.options.labelClickable && !this.options.disable && !this.options.readOnly){ this.canvasId = this.canvasId || 0; @@ -68559,6 +68570,9 @@ if (typeof define === 'function' && define.amd) { }, postAppendGrid: function(){ + if (this.options.handleFixed && this.options.gridColors && this.options.extendGridColors) + this.appendPreAndPostGridColors(); + //Update the height of the slider this.cache.$container.css('height', (this.nextGridTop + this.$currentGrid.height())+'px' ); }, @@ -68716,6 +68730,20 @@ if (typeof define === 'function' && define.amd) { } } }, + + appendPreAndPostGridColors: function(){ + $('') + .addClass( 'grid-color pre') + .prependTo( this.$currentGrid ); + $('') + .addClass( 'grid-color post') + .appendTo( this.$currentGrid ); + } + + + + + }; //end of BaseSlider.prototype @@ -74918,32 +74946,48 @@ options: noDateLabels : BOOLEAN; If true no labels with the date are shown; dateAtMidnight : BOOLEAN; If true the time-LABEL for midnight is replaced with a short date-label. Normally used together noDateLabels: true + + minMoment, + maxMoment, + fromMoment + toMoment : MOMENT; Same as min, max, from, to in jquery-base-slider but as moment-object + format: - showRelative : BOOLEAN; If true the grid etc show the relative time ('Now + 2h') Default = false - showUTC : BOOLEAN; When true a scale for utc is also shown, but only if the time-zone isn't utc or forceUTC is set. Default = false. Only if showRelative == false - forceUTC : BOOLEAN; If true and showUTC: true the utc-scale is included - noGridColorsOnUTC : BOOLEAN; If true the UTC-grid will not get any grid colors - noLabelColorsOnUTC : BOOLEAN; If true the UTC-grid will not get any labels with colors - UTCGridClassName : STRING; Class-name(s) for the grids use for UTC time-lime + date : STRING; Date format. "DMY" or "MDY" or "YMD" If none is given the format is set by [moment-simple-format](https://github.com/FCOO/moment-simple-format) + showYear : BOOLEAN; If true the date-time info in handler includes the year + time : STRING; Time format. "12" or "24" + timezone : STRING; "local"` or `"utc"` or abbreviation of time zone. Only if showRelative: false + text : {hourAbbr:"h", minAbbr:"m", now:"now", to:"to"}; Text used to format the date + + showRelative: BOOLEAN; If true the grid etc show the relative time ('Now + 2h') Default = false - showExtraRelative : BOOLEAN; If true and showRelative = false => A relative scale is included - noGridColorsOnExtraRelative : BOOLEAN; If true the extra relative-grid will not get any grid colors - noLabelColorsOnExtraRelative: BOOLEAN; If true the extra relative-grid will not get any labels with colors + showUTC : BOOLEAN; When true a scale for utc is also shown, but only if the time-zone isn't utc or forceUTC is set. Default = false. Only if showRelative == false + forceUTC : BOOLEAN; If true and showUTC: true the utc-scale is included + noGridColorsOnUTC : BOOLEAN; If true the UTC-grid will not get any grid colors + noExtendedGridColorsOnUTC: BOOLEAN; If true the UTC-grid will not get any extended grid colors + noLabelColorsOnUTC : BOOLEAN; If true the UTC-grid will not get any labels with colors + UTCGridClassName : STRING; Class-name(s) for the grids use for UTC time-lime - ExtraRelativeGridClassName : STRING; Class-name(s) for the grids use for the extra relative grid + showExtraRelative : BOOLEAN; If true and showRelative = false => A relative scale is included + noGridColorsOnExtraRelative : BOOLEAN; If true the extra relative-grid will not get any grid colors + noExtendedGridColorsOnExtraRelative: BOOLEAN; If true the extra relative-grid will not get any extended grid colors + noLabelColorsOnExtraRelative : BOOLEAN; If true the extra relative-grid will not get any labels with colors + extraRelativeGridClassName : STRING; Class-name(s) for the grids use for the extra relative grid showRelative : as format.showRelative showUTC : as format.showUTC forceUTC : as format.forceUTC - noGridColorsOnUTC : as format.noGridColorsOnUTC - noLabelColorsOnUTC : as format.noLabelColorsOnUTC - UTCGridClassName : as format.UTCGridClassName + noGridColorsOnUTC : as format.noGridColorsOnUTC + noExtendedGridColorsOnUTC : as format.noExtendedGridColorsOnUTC + noLabelColorsOnUTC : as format.noLabelColorsOnUTC + UTCGridClassName : as format.UTCGridClassName - showExtraRelative : as format.showExtraRelative - noGridColorsOnExtraRelative : as format.noGridColorsOnExtraRelative - noLabelColorsOnExtraRelative: as format.noLabelColorsOnExtraRelative - ExtraRelativeGridClassName : as format.ExtraRelativeGridClassName + showExtraRelative : as format.showExtraRelative + noGridColorsOnExtraRelative : as format.noGridColorsOnExtraRelative + noExtendedGridColorsOnExtraRelative : as format.noExtendedGridColorsOnExtraRelative + noLabelColorsOnExtraRelative : as format.noLabelColorsOnExtraRelative + extraRelativeGridClassName : as format.extraRelativeGridClassName NB: Using moment-simple-format to set and get text and format for date and time @@ -75001,7 +75045,7 @@ options: }; window.TimeSlider = function (input, options, pluginCount) { - this.VERSION = "7.6.2"; + this.VERSION = "7.7.2"; //Setting default options this.options = $.extend( true, {}, defaultOptions, options ); @@ -75252,7 +75296,11 @@ options: o.labelColorRec = labelColorRec; } + //date grid never has extendedGridColors + var save = o.extendGridColors; + o.extendGridColors = false; this.postAppendGrid(); + o.extendGridColors = save; }, /************************************************************** @@ -75268,11 +75316,12 @@ options: //***************************************************** - function appendSpecialGrid( noGridColorId, noLabelColorsId, gridClassNameId, newLabels ){ - var noGridColors = opt.format[noGridColorId] || opt[noGridColorId], - noLabelColors = opt.format[noGridColorId] || opt[noGridColorId], + function appendSpecialGrid( gridOpt ){ + var noGridColors = opt.format[gridOpt.noGridColorId] || opt[gridOpt.noGridColorId], + noLabelColors = opt.format[gridOpt.noLabelColorsId] || opt[gridOpt.noLabelColorsId], + gridClassName = opt.format[gridOpt.gridClassNameId] || opt[gridOpt.gridClassNameId] || '', + noExtendGridColors = opt.format[gridOpt.noExtendGridColorsId] || opt[gridOpt.noExtendGridColorsId], - gridClassName = opt.format[gridClassNameId] || opt[gridClassNameId] || '', saveOptions = $.extend(true, {}, _this.options); opt.size.majorTickLength = 3; //Normal = 9 @@ -75282,12 +75331,15 @@ options: //If noGridColors is set => remove grid-colors if (noGridColors) opt.gridColors = null; + else + if (noExtendGridColors) + opt.extendGridColors = false; //If noLabelColors is set => remove label-colors if (noLabelColors) opt.labelColors = null; - if (newLabels) + if (gridOpt.newLabels) opt.maxLabelWidth = null; //Force recalculating label-space _this._appendStandardGrid(textOptions, tickOptions); @@ -75331,7 +75383,13 @@ options: var saveMajorTicksOffset = opt.majorTicksOffset; opt.majorTicksOffset = 0; - appendSpecialGrid( 'noGridColorsOnExtraRelative', 'noLabelColorsOnExtraRelative', 'ExtraRelativeGridClassName', true ); + appendSpecialGrid({ + noGridColorId : 'noGridColorsOnExtraRelative', + noLabelColorsId : 'noLabelColorsOnExtraRelative', + gridClassNameId : 'extraRelativeGridClassName', + noExtendGridColorsId: 'noExtendedGridColorsOnExtraRelative', + newLabels : true + }); opt.majorTicksOffset = saveMajorTicksOffset; } @@ -75348,7 +75406,13 @@ options: this._prettify = this._prettifyAbsolute; this._prettifyLabel = this._prettifyLabelAbsolute; - appendSpecialGrid( 'noGridColorsOnUTC', 'noLabelColorsOnUTC', 'UTCGridClassName'); + appendSpecialGrid({ + noGridColorId : 'noGridColorsOnUTC', + noLabelColorsId : 'noLabelColorsOnUTC', + gridClassNameId : 'UTCGridClassName', + noExtendGridColorsId: 'noExtendedGridColorsOnUTC', + newLabels : false + }); this.appendDateGrid( textOptions, tickOptions ); this.$currentGrid.addClass(opt.format.UTCGridClassName || opt.UTCGridClassName || ''); @@ -75593,12 +75657,12 @@ options: /*! @websanova/url - v2.6.3 - 2020-01-25 */ !function(){function t(t,r){var a,o={};if("tld?"!==t){if(r=r||window.location.toString(),!t)return r;if(t=t.toString(),a=r.match(/^mailto:([^\/].+)/))o.protocol="mailto",o.email=a[1];else{if((a=r.match(/(.*?)\/#\!(.*)/))&&(r=a[1]+a[2]),(a=r.match(/(.*?)#(.*)/))&&(o.hash=a[2],r=a[1]),o.hash&&t.match(/^#/))return h(t,o.hash);if((a=r.match(/(.*?)\?(.*)/))&&(o.query=a[2],r=a[1]),o.query&&t.match(/^\?/))return h(t,o.query);if((a=r.match(/(.*?)\:?\/\/(.*)/))&&(o.protocol=a[1].toLowerCase(),r=a[2]),(a=r.match(/(.*?)(\/.*)/))&&(o.path=a[2],r=a[1]),o.path=(o.path||"").replace(/^([^\/])/,"/$1"),t.match(/^[\-0-9]+$/)&&(t=t.replace(/^([^\/])/,"/$1")),t.match(/^\//))return e(t,o.path.substring(1));if((a=(a=e("/-1",o.path.substring(1)))&&a.match(/(.*?)\.([^.]+)$/))&&(o.file=a[0],o.filename=a[1],o.fileext=a[2]),(a=r.match(/(.*)\:([0-9]+)$/))&&(o.port=a[2],r=a[1]),(a=r.match(/(.*?)@(.*)/))&&(o.auth=a[1],r=a[2]),o.auth&&(a=o.auth.match(/(.*)\:(.*)/),o.user=a?a[1]:o.auth,o.pass=a?a[2]:void 0),o.hostname=r.toLowerCase(),"."===t.charAt(0))return e(t,o.hostname);o.port=o.port||("https"===o.protocol?"443":"80"),o.protocol=o.protocol||("443"===o.port?"https":"http")}return t in o?o[t]:"{}"===t?o:void 0}}function e(t,r){var a=t.charAt(0),o=r.split(a);return a===t?o:o[(t=parseInt(t.substring(1),10))<0?o.length+t:t-1]}function h(t,r){for(var a,o=t.charAt(0),e=r.split("&"),h=[],n={},c=[],i=t.substring(1),p=0,u=e.length;p 1 ); //Quick test for mobile devices. let isMobileDevice = (isSafariIOSDesktopMode || /Mobi|Tablet|Android|iPad|iPhone/.test(ua)); - //Safari desktop requires special handling - let isSafariDesktop = ( !isMobileDevice && - nav.vendor !== undefined && - /Apple/.test(nav.vendor) && + //Safari desktop requires special handling + let isSafariDesktop = ( !isMobileDevice && + nav.vendor !== undefined && + /Apple/.test(nav.vendor) && /Safari/.test(ua) ); - + //Firefox started shipping PDF.js in Firefox 19. If this is Firefox 19 or greater, assume PDF.js is available let isFirefoxWithPDFJS = (!isMobileDevice && /irefox/.test(ua) && ua.split("rv:").length > 1) ? (parseInt(ua.split("rv:")[1].split(".")[0], 10) > 18) : false; @@ -78911,9 +78975,9 @@ module.exports = g; let source = url; - if(embedType === "pdfjs"){ + if(embedType === "pdfjs"){ //If PDFJS_URL already contains a ?, assume querystring is in place, and use an ampersand to append PDFJS's file parameter - let connector = (PDFJS_URL.indexOf("?") !== -1) ? "&" : "?"; + let connector = (PDFJS_URL.indexOf("?") !== -1) ? "&" : "?"; source = PDFJS_URL + connector + "file=" + encodeURIComponent(url) + pdfOpenFragment; } else { source += pdfOpenFragment; @@ -78948,7 +79012,7 @@ module.exports = g; style += "position: absolute; top: 0; right: 0; bottom: 0; left: 0; width: 100%; height: 100%;"; } - el.style.cssText = style; + el.style.cssText = style; } @@ -79013,32 +79077,32 @@ module.exports = g; if(forcePDFJS && PDFJS_URL){ return generatePDFObjectMarkup("pdfjs", targetNode, url, pdfOpenFragment, width, height, id, title, omitInlineStyles, customAttribute, PDFJS_URL); } - + // --== Embed attempt #2 ==-- //Embed PDF if traditional support is provided, or if this developer is willing to roll with assumption - //that modern desktop (not mobile) browsers natively support PDFs + //that modern desktop (not mobile) browsers natively support PDFs if(supportsPDFs || (assumptionMode && !isMobileDevice)){ - - //Should we use or