bump version 0.2.8

tcs-rliess · Apr 3, 2017 · e807595 · e807595
1 parent 6aa8ca4
commit e807595
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -186,6 +186,7 @@ A [Select2](https://select2.github.io) interface to use it inside a facet.
 
 | Version |    Date    | Description                              |
 | :-----: | :--------: | :--------------------------------------- |
+|  0.2.8  | 2017-04-03 | Fixed daterange facet locale option overwrite #71  |
 |  0.2.7  | 2017-02-02 | Fixed load if no options are passed #70  |
 |  0.2.6  | 2017-02-02 | Fixed doubled search event on mouse click |
 |  0.2.5  | 2017-02-01 | #69 tried to reduce jumping ui + optimized ux |

diff --git a/css/iggy.css b/css/iggy.css
diff --git a/dist/css/iggy.css b/dist/css/iggy.css
diff --git a/dist/js/iggy.js b/dist/js/iggy.js
diff --git a/example/script.js b/example/script.js
@@ -641,6 +641,9 @@ jQuery( function( $ ){
 			//format: "DD [foo] MMM [bar] YY",
 			showWeekNumbers : true,
 			showDropdowns : true,
+			locale: {
+				firstDay : 1
+			},
 			timePicker: false,
 			ranges: {
 				'Today': [moment(), moment()],
@@ -663,6 +666,9 @@ jQuery( function( $ ){
 			showWeekNumbers : true,
 			showDropdowns : true,
 			timePicker: false,
+			locale: {
+				firstDay : 3
+			},
 			ranges: {
 				'Today': [moment(), moment()],
 				'Yesterday': [moment().subtract(1, 'day'), moment().subtract(1, 'day')],

diff --git a/js/iggy.debug.js b/js/iggy.debug.js
diff --git a/js/iggy.js b/js/iggy.js
@@ -31,6 +31,8 @@ IGGY = (function(superClass) {
 
   IGGY.prototype.$ = jQuery;
 
+  IGGY.prototype.jQuery = jQuery;
+
   function IGGY(el, facets, options) {
     if (facets == null) {
       facets = [];
@@ -1235,6 +1237,7 @@ FacetSubsBase = (function(superClass) {
 
   FacetSubsBase.prototype.initialize = function(options) {
     this.sub = options.sub;
+    this.jQuery = this.sub.jQuery;
     this.result = new SubResults();
   };
 
@@ -1509,7 +1512,7 @@ FacetSubsDateRange = (function(superClass) {
   FacetSubsDateRange.prototype.focus = function() {
     var _opts, ref;
     if (this.daterangepicker == null) {
-      _opts = _.extend({}, this.model.get("opts"), this.forcedDateRangeOpts());
+      _opts = this.jQuery.extend(true, {}, this.model.get("opts"), this.forcedDateRangeOpts());
       this.$inp.daterangepicker(_opts, this._dateReturn);
       this.daterangepicker = this.$inp.data("daterangepicker");
       if ((ref = this.daterangepicker.container) != null) {
@@ -2953,6 +2956,7 @@ MainView = (function(superClass) {
   MainView.prototype.initialize = function(options) {
     var _cl, _fnSort, _valueFacets, fct, i, len, ref, ref1;
     this.main = options.main;
+    this.jQuery = this.main.jQuery;
     this.idx = options.idx;
     this.results = options.results;
     this.facets = {};
@@ -3717,6 +3721,7 @@ ViewSub = (function(superClass) {
     this._isOpen = false;
     this.result = new Backbone.Collection();
     this.parent = options.parent;
+    this.jQuery = this.parent.jQuery;
     this.$el.data("fctid", this.model.id);
     this.parent.on("escape", (function(_this) {
       return function(evnt, cb) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iggy",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Browser search module to use with Backbone.js",
   "keywords": [],
   "homepage": "https://github.com/mpneuried/iggy",