xdan-datetimepicker-rails 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d93e36be754816955a4ae9bdb6049b80009a2567
-  data.tar.gz: 80c262e33b594ecf00a825247ccacffce1e87f36
+  metadata.gz: c4540044f283cee237da711b04abef19d9f02762
+  data.tar.gz: 117a405cb589b9b0cac60c0c5b09536055285205
 SHA512:
-  metadata.gz: ed2a05f9abb7bc57f9997c33c0bb5644cf07dde823a405caaaef9af2c1db20024dca9b63b40a4f656a70ca494af35d018b7263e57edf61d81dbab995f16bbbe6
-  data.tar.gz: c83389650af6c3c865c0ab41ee82723b02ba999d9480aefaef8898c9b3c8d237909e9949ea2e05eadbeba408fd6ef579367d4f5409983fdeb7108064d6b8e643
+  metadata.gz: a96c3e61b09a9c64dbf976d42a0453b7c60ad3f4f03eac5ebacd600656b368cf3fa46906e236faea8b8d1b79fd4e34f6bc8cd2acdc560681d2fe2c263e694bc1
+  data.tar.gz: 10d1c0f3d19975a489f05f1ec92f22bcba0e7fb6831c4a66db378b36d2f573c00c05f31d7165c1196d4c54a185379d1204202594dc437895b5ab55b21274059b

data/Rakefile

@@ -1,21 +1,44 @@
 require "bundler/gem_tasks"
+require "xdan-datetimepicker-rails/version"
 
-require 'net/http'
-require 'open-uri'
+require "net/http"
+require "open-uri"
 
 namespace :source do
   desc "update the source file"
   task :update do
-    version = ENV['version'] || 'master'
+    old_version = XdanDatetimepickerRails::VERSION
+    new_version = ENV["version"] || "master"
     puts "Downloading jquery.datetimepicker.js..."
-    download "https://raw.github.com/xdan/datetimepicker/#{version}/jquery.datetimepicker.js", "app/assets/javascripts/jquery.xdan.datetimepicker.js"
+    download "https://raw.github.com/xdan/datetimepicker/#{new_version}/jquery.datetimepicker.js", "app/assets/javascripts/jquery.xdan.datetimepicker.js"
 
     puts "Downloading jquery.datetimepicker.css..."
-    download "https://raw.github.com/xdan/datetimepicker/#{version}/jquery.datetimepicker.css", "app/assets/stylesheets/jquery.xdan.datetimepicker.css"
+    download "https://raw.github.com/xdan/datetimepicker/#{new_version}/jquery.datetimepicker.css", "app/assets/stylesheets/jquery.xdan.datetimepicker.css"
+
+    update_version from: old_version, to: new_version
+
+    system "git add app/assets/ lib/xdan-datetimepicker-rails/version.rb"
+    system "git commit -m 'Update source to version #{new_version}\n\n[Diff from #{old_version} to #{new_version}](https://www.github.com/xdan/datetimepicker/compare/#{old_version}...#{new_version})'"
+    system "git tag #{new_version}"
   end
 end
 
+namespace :rubygems do
+  desc "build and release new version to rubygems"
+  task :release do
+    puts "Building xdan-datetimepicker-rails.gemspec"
+    system "gem build xdan-datetimepicker-rails.gemspec"
+    print "\nPushing xdan-datetimepicker-rails-#{XdanDatetimepickerRails::VERSION} to rubygems..."
+    system "gem push xdan-datetimepicker-rails-#{XdanDatetimepickerRails::VERSION}.gem"
+    puts "done!"
+  end
+end
 
-def download remote_path, local_path
+def download(remote_path, local_path)
   `wget -O #{local_path} #{remote_path}`
 end
+
+def update_version(from:, to:)
+  version_rb = "lib/xdan-datetimepicker-rails/version.rb"
+  File.write(version_rb, File.open(version_rb, &:read).gsub(from, to))
+end

data/app/assets/javascripts/jquery.xdan.datetimepicker.js

@@ -1,5 +1,5 @@
 /**
- * @preserve jQuery DateTimePicker plugin v2.4.3
+ * @preserve jQuery DateTimePicker plugin v2.4.4
  * @homepage http://xdsoft.net/jqplugins/datetimepicker/
  * (c) 2014, Chupurnov Valeriy.
  */
@@ -32,6 +32,14 @@
 					"Min", "Sen", "Sel", "Rab", "Kam", "Jum", "Sab"
 				]
 			},
+			is: { // Icelandic
+				months: [
+					"Janúar", "Febrúar", "Mars", "Apríl", "Maí", "Júní", "Júlí", "Ágúst", "September", "Október", "Nóvember", "Desember"
+				],
+				dayOfWeek: [
+					"Sun", "Mán", "Þrið", "Mið", "Fim", "Fös", "Lau"
+				]
+			},
 			bg: { // Bulgarian
 				months: [
 					"Януари", "Февруари", "Март", "Април", "Май", "Юни", "Юли", "Август", "Септември", "Октомври", "Ноември", "Декември"
@@ -460,6 +468,8 @@
 		maxDate: false,
 		minTime: false,
 		maxTime: false,
+		disabledMinTime: false,
+		disabledMaxTime: false,
 
 		allowTimes: [],
 		opened: false,
@@ -511,6 +521,7 @@
 		highlightedDates: [],
 		highlightedPeriods: [],
 		disabledDates : [],
+		disabledWeekDays: [],
 		yearOffset: 0,
 		beforeShowDay: null,
 
@@ -735,7 +746,7 @@
 			};
 
 		createDateTimePicker = function (input) {
-			var datetimepicker = $('<div ' + (options.id ? 'id="' + options.id + '"' : '') + ' ' + (options.style ? 'style="' + options.style + '"' : '') + ' class="xdsoft_datetimepicker xdsoft_' + options.theme + ' xdsoft_noselect ' + (options.weeks ? ' xdsoft_showweeks' : '') + options.className + '"></div>'),
+			var datetimepicker = $('<div class="xdsoft_datetimepicker xdsoft_noselect"></div>'),
 				xdsoft_copyright = $('<div class="xdsoft_copyright"><a target="_blank" href="http://xdsoft.net/jqplugins/datetimepicker/">xdsoft.net</a></div>'),
 				datepicker = $('<div class="xdsoft_datepicker active"></div>'),
 				mounth_picker = $('<div class="xdsoft_mounthpicker"><button type="button" class="xdsoft_prev"></button><button type="button" class="xdsoft_today_button"></button>' +
@@ -746,7 +757,7 @@
 				timepicker = $('<div class="xdsoft_timepicker active"><button type="button" class="xdsoft_prev"></button><div class="xdsoft_time_box"></div><button type="button" class="xdsoft_next"></button></div>'),
 				timeboxparent = timepicker.find('.xdsoft_time_box').eq(0),
 				timebox = $('<div class="xdsoft_time_variant"></div>'),
-                applyButton = $('<button class="xdsoft_save_selected blue-gradient-button">Save Selected</button>'),
+                applyButton = $('<button type="button" class="xdsoft_save_selected blue-gradient-button">Save Selected</button>'),
 				/*scrollbar = $('<div class="xdsoft_scrollbar"></div>'),
 				scroller = $('<div class="xdsoft_scroller"></div>'),*/
 				monthselect = $('<div class="xdsoft_select xdsoft_monthselect"><div></div></div>'),
@@ -762,6 +773,13 @@
 				timer1 = 0,
 				_xdsoft_datetime;
 
+			if (options.id) datetimepicker.attr('id', options.id);
+			if (options.style) datetimepicker.attr('style', options.style);
+			if (options.weeks) datetimepicker.addClass('xdsoft_showweeks');
+
+			datetimepicker.addClass('xdsoft_' + options.theme);
+			datetimepicker.addClass(options.className);
+
 			mounth_picker
 				.find('.xdsoft_month span')
 					.after(monthselect);
@@ -935,6 +953,10 @@
 				if (_options.disabledDates && $.isArray(_options.disabledDates) && _options.disabledDates.length) {
 					options.disabledDates = $.extend(true, [], _options.disabledDates);
 				}
+				
+				if (_options.disabledWeekDays && $.isArray(_options.disabledWeekDays) && _options.disabledWeekDays.length) {
+				    options.disabledWeekDays = $.extend(true, [], _options.disabledWeekDays);
+				}
 
 				if ((options.open || options.opened) && (!options.inline)) {
 					input.trigger('open.xdsoft');
@@ -1325,6 +1347,18 @@
 					_xdsoft_datetime.setCurrentTime(0);
 					datetimepicker.trigger('afterOpen.xdsoft');
 				}).on('dblclick.xdsoft', function () {
+					var currentDate = _xdsoft_datetime.getCurrentTime();
+					currentDate = new Date(currentDate.getFullYear(),currentDate.getMonth(),currentDate.getDate());
+					var minDate = _xdsoft_datetime.strToDate(options.minDate);
+					minDate = new Date(minDate.getFullYear(),minDate.getMonth(),minDate.getDate());
+					if(currentDate < minDate) {
+						return;
+					}
+					var maxDate = _xdsoft_datetime.strToDate(options.maxDate);
+					maxDate = new Date(maxDate.getFullYear(),maxDate.getMonth(),maxDate.getDate());
+					if(currentDate > maxDate) {
+						return;
+					}
 					input.val(_xdsoft_datetime.str());
 					datetimepicker.trigger('close.xdsoft');
 				});
@@ -1404,6 +1438,7 @@
 							maxDate = false,
 							minDate = false,
 							hDate,
+							day,
 							d,
 							y,
 							m,
@@ -1447,6 +1482,7 @@
 							classes = [];
 							i += 1;
 
+							day = start.getDay();
 							d = start.getDate();
 							y = start.getFullYear();
 							m = start.getMonth();
@@ -1465,6 +1501,8 @@
 								classes.push('xdsoft_disabled');
 							} else if (options.disabledDates.indexOf(start.dateFormat(options.formatDate)) !== -1) {
 								classes.push('xdsoft_disabled');
+							} else if (options.disabledWeekDays.indexOf(day) !== -1) {
+							    classes.push('xdsoft_disabled');
 							}
 
 							if (customDateSettings && customDateSettings[1] !== "") {
@@ -1540,6 +1578,9 @@
 							if ((options.minDateTime !== false && options.minDateTime > optionDateTime) || (options.maxTime !== false && _xdsoft_datetime.strtotime(options.maxTime).getTime() < now.getTime()) || (options.minTime !== false && _xdsoft_datetime.strtotime(options.minTime).getTime() > now.getTime())) {
 								classes.push('xdsoft_disabled');
 							}
+							if ((options.minDateTime !== false && options.minDateTime > optionDateTime) || ((options.disabledMinTime !== false && now.getTime() > _xdsoft_datetime.strtotime(options.disabledMinTime).getTime()) && (options.disabledMaxTime !== false && now.getTime() < _xdsoft_datetime.strtotime(options.disabledMaxTime).getTime()))) {
+			                                	classes.push('xdsoft_disabled');
+			                            	}
 
 							current_time = new Date(_xdsoft_datetime.currentTime);
 							current_time.setHours(parseInt(_xdsoft_datetime.currentTime.getHours(), 10));
@@ -1641,7 +1682,7 @@
 					datetimepicker.trigger('select.xdsoft', [currentTime]);
 
 					input.val(_xdsoft_datetime.str());
-					if ((timerclick > 1 || (options.closeOnDateSelect === true || (options.closeOnDateSelect === 0 && !options.timepicker))) && !options.inline) {
+					if ((timerclick > 1 || (options.closeOnDateSelect === true || (options.closeOnDateSelect === false && !options.timepicker))) && !options.inline) {
 						datetimepicker.trigger('close.xdsoft');
 					}
 
@@ -1769,6 +1810,14 @@
 						left = $(window).width() - datetimepicker[0].offsetWidth;
 					}
 				}
+				var node = datetimepicker[0]
+				do {
+					node = node.parentNode;
+					if(window.getComputedStyle(node).getPropertyValue('position') === 'relative' && $(window).width() >= node.offsetWidth) {
+						left = left - (($(window).width() - node.offsetWidth)/2)
+						break
+					}
+				} while(node.nodeName != 'HTML')
 				datetimepicker.css({
 					left: left,
 					top: top,

data/lib/xdan-datetimepicker-rails/version.rb

@@ -1,3 +1,3 @@
 module XdanDatetimepickerRails
-  VERSION = '2.4.3'
+  VERSION = '2.4.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xdan-datetimepicker-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Joshua Kovach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: XDan's jQuery DateTimePicker packaged for the Rails Asset Pipeline