From ce3e96ef5bf786fef85f1dba7fbd3d49862fcbcc Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Thu, 26 May 2016 19:24:31 +0100 Subject: [PATCH] Updated bootstrap-daterangepicker to vs 2.1.20, regen dist files --- application/views/partial/header.php | 4 +- bower.json | 2 +- dist/opensourcepos.js | 126 ++++++++++++-------- dist/opensourcepos.min.css | 2 +- dist/opensourcepos.min.js | 39 +++--- templates/spacelab/views/partial/header.php | 4 +- 6 files changed, 101 insertions(+), 76 deletions(-) diff --git a/application/views/partial/header.php b/application/views/partial/header.php index e8a903f45..d5ad16485 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -66,10 +66,10 @@ - + - + diff --git a/bower.json b/bower.json index 8d02cb2df..2f168e837 100644 --- a/bower.json +++ b/bower.json @@ -34,7 +34,7 @@ "smalot-bootstrap-datetimepicker": "^2.3.11", "bootstrap-select": "^1.10.0", "bootstrap-table": "^1.10.1", - "bootstrap-daterangepicker": "^2.1.19", + "bootstrap-daterangepicker": "^2.1.20", "table-export": "*", "jquery.base64": "https://raw.githubusercontent.com/carlo/jquery-base64/master/jquery.base64.js", "chartist": "^0.9.7", diff --git a/dist/opensourcepos.js b/dist/opensourcepos.js index 58742a24e..ee1eea8f2 100644 --- a/dist/opensourcepos.js +++ b/dist/opensourcepos.js @@ -15048,41 +15048,33 @@ return jQuery; })); /** -* @version: 2.1.19 +* @version: 2.1.20 * @author: Dan Grossman http://www.dangrossman.info/ -* @copyright: Copyright (c) 2012-2015 Dan Grossman. All rights reserved. +* @copyright: Copyright (c) 2012-2016 Dan Grossman. All rights reserved. * @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php * @website: https://www.improvely.com/ */ - -(function(root, factory) { - - if (typeof define === 'function' && define.amd) { - define(['moment', 'jquery', 'exports'], function(momentjs, $, exports) { - root.daterangepicker = factory(root, exports, momentjs, $); - }); - - } else if (typeof exports !== 'undefined') { - var momentjs = require('moment'); - var jQuery = (typeof window != 'undefined') ? window.jQuery : undefined; //isomorphic issue - if (!jQuery) { - try { - jQuery = require('jquery'); - if (!jQuery.fn) jQuery.fn = {}; //isomorphic issue - } catch (err) { - if (!jQuery) throw new Error('jQuery dependency not found'); - } - } - - factory(root, exports, momentjs, jQuery); - - // Finally, as a browser global. - } else { - root.daterangepicker = factory(root, {}, root.moment || moment, (root.jQuery || root.Zepto || root.ender || root.$)); - } - -}(this || {}, function(root, daterangepicker, moment, $) { // 'this' doesn't exist on a server - +// Follow the UMD template https://github.com/umdjs/umd/blob/master/templates/returnExportsGlobal.js +(function (root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Make globaly available as well + define(['moment', 'jquery'], function (moment, jquery) { + return (root.daterangepicker = factory(moment, jquery)); + }); + } else if (typeof module === 'object' && module.exports) { + // Node / Browserify + //isomorphic issue + var jQuery = (typeof window != 'undefined') ? window.jQuery : undefined; + if (!jQuery) { + jQuery = require('jquery'); + if (!jQuery.fn) jQuery.fn = {}; + } + module.exports = factory(require('moment'), jQuery); + } else { + // Browser globals + root.daterangepicker = factory(root.moment, root.jQuery); + } +}(this, function(moment, $) { var DateRangePicker = function(element, options, cb) { //default settings for options @@ -15120,6 +15112,7 @@ return jQuery; this.cancelClass = 'btn-default'; this.locale = { + direction: 'ltr', format: 'MM/DD/YYYY', separator: ' - ', applyLabel: 'Apply', @@ -15151,7 +15144,7 @@ return jQuery; options.template = '