fixed issue with functions returning

Zamen · Aug 12, 2017 · 2dd322c · 2dd322c
1 parent 990af2b
commit 2dd322c
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 53 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tempusdominus-bootstrap-3",
-  "version": "5.0.0-alpha7",
+  "version": "5.0.0-alpha8",
   "main": [
     "build/css/tempusdominus-bootstrap-3.min.css",
     "build/js/tempusdominus-bootstrap-3.min.js"

diff --git a/build/js/tempusdominus-bootstrap-3.js b/build/js/tempusdominus-bootstrap-3.js
@@ -763,7 +763,7 @@ var DateTimePicker = function ($) {
             this.currentViewMode = Math.max(MinViewModeNumber, this.currentViewMode);
 
             if (!this.unset) {
-                this._setValue(this._date);
+                this._setValue(this._dates[0], 0);
             }
         };
 
@@ -2666,24 +2666,35 @@ var TempusDominusBootstrap3 = function ($) {
         //static
 
 
-        TempusDominusBootstrap3._jQueryInterface = function _jQueryInterface(option, argument) {
-            return this.each(function () {
-                var data = $(this).data(DateTimePicker.DATA_KEY);
-                if ((typeof option === 'undefined' ? 'undefined' : _typeof(option)) === 'object') {
-                    $.extend({}, DateTimePicker.Default, option);
-                }
+        TempusDominusBootstrap3._jQueryHandleThis = function _jQueryHandleThis(me, option, argument) {
+            var data = $(me).data(DateTimePicker.DATA_KEY);
+            if ((typeof option === 'undefined' ? 'undefined' : _typeof(option)) === 'object') {
+                $.extend({}, DateTimePicker.Default, option);
+            }
 
-                if (!data) {
-                    data = new TempusDominusBootstrap3($(this), option);
-                    $(this).data(DateTimePicker.DATA_KEY, data);
-                }
+            if (!data) {
+                data = new TempusDominusBootstrap3($(me), option);
+                $(me).data(DateTimePicker.DATA_KEY, data);
+            }
 
-                if (typeof option === 'string') {
-                    if (data[option] === undefined) {
-                        throw new Error('No method named "' + option + '"');
-                    }
-                    data[option](argument);
+            if (typeof option === 'string') {
+                if (data[option] === undefined) {
+                    throw new Error('No method named "' + option + '"');
                 }
+                if (argument === undefined) {
+                    return data[option]();
+                } else {
+                    return data[option](argument);
+                }
+            }
+        };
+
+        TempusDominusBootstrap3._jQueryInterface = function _jQueryInterface(option, argument) {
+            if (this.length === 1) {
+                return TempusDominusBootstrap3._jQueryHandleThis(this[0], option, argument);
+            }
+            return this.each(function () {
+                TempusDominusBootstrap3._jQueryHandleThis(this, option, argument);
             });
         };
 

diff --git a/build/js/tempusdominus-bootstrap-3.min.js b/build/js/tempusdominus-bootstrap-3.min.js
diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "tempusdominus-bootstrap-3",
-  "version": "5.0.0-alpha7",
+  "version": "5.0.0-alpha8",
   "main": "build/js/tempusdominus-bootstrap-3.min.js",
   "scripts": [ "build/js/tempusdominus-bootstrap-3.min.js" ],
   "styles": [ "build/css/tempusdominus-bootstrap-3.min.css" ],

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "tempusdominus/bootstrap-3",
   "type": "component",
-  "version": "5.0.0-alpha7",
+  "version": "5.0.0-alpha8",
   "description": "Date/time picker widget based on twitter bootstrap",
   "keywords": [
     "bootstrap",

diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "type": "git",
     "url": "https://github.com/tempusdominus/bootstrap-3.git"
   },
-  "version": "5.0.0-alpha7",
+  "version": "5.0.0-alpha8",
   "files": [
     "build",
     "src/js/**/*.js",

diff --git a/src/docs/theme/js/tempusdominus-bootstrap-3.js b/src/docs/theme/js/tempusdominus-bootstrap-3.js
@@ -763,7 +763,7 @@ var DateTimePicker = function ($) {
             this.currentViewMode = Math.max(MinViewModeNumber, this.currentViewMode);
 
             if (!this.unset) {
-                this._setValue(this._date);
+                this._setValue(this._dates[0], 0);
             }
         };
 
@@ -2666,24 +2666,35 @@ var TempusDominusBootstrap3 = function ($) {
         //static
 
 
-        TempusDominusBootstrap3._jQueryInterface = function _jQueryInterface(option, argument) {
-            return this.each(function () {
-                var data = $(this).data(DateTimePicker.DATA_KEY);
-                if ((typeof option === 'undefined' ? 'undefined' : _typeof(option)) === 'object') {
-                    $.extend({}, DateTimePicker.Default, option);
-                }
+        TempusDominusBootstrap3._jQueryHandleThis = function _jQueryHandleThis(me, option, argument) {
+            var data = $(me).data(DateTimePicker.DATA_KEY);
+            if ((typeof option === 'undefined' ? 'undefined' : _typeof(option)) === 'object') {
+                $.extend({}, DateTimePicker.Default, option);
+            }
 
-                if (!data) {
-                    data = new TempusDominusBootstrap3($(this), option);
-                    $(this).data(DateTimePicker.DATA_KEY, data);
-                }
+            if (!data) {
+                data = new TempusDominusBootstrap3($(me), option);
+                $(me).data(DateTimePicker.DATA_KEY, data);
+            }
 
-                if (typeof option === 'string') {
-                    if (data[option] === undefined) {
-                        throw new Error('No method named "' + option + '"');
-                    }
-                    data[option](argument);
+            if (typeof option === 'string') {
+                if (data[option] === undefined) {
+                    throw new Error('No method named "' + option + '"');
                 }
+                if (argument === undefined) {
+                    return data[option]();
+                } else {
+                    return data[option](argument);
+                }
+            }
+        };
+
+        TempusDominusBootstrap3._jQueryInterface = function _jQueryInterface(option, argument) {
+            if (this.length === 1) {
+                return TempusDominusBootstrap3._jQueryHandleThis(this[0], option, argument);
+            }
+            return this.each(function () {
+                TempusDominusBootstrap3._jQueryHandleThis(this, option, argument);
             });
         };
 

diff --git a/src/js/tempusdominus-bootstrap-3.js b/src/js/tempusdominus-bootstrap-3.js
@@ -1064,24 +1064,36 @@ const TempusDominusBootstrap3 = ($ => { // eslint-disable-line no-unused-vars
         }
 
         //static
-        static _jQueryInterface(option, argument) {
-            return this.each(function () {
-                let data = $(this).data(DateTimePicker.DATA_KEY);
-                if (typeof option === 'object') {
-                    $.extend({}, DateTimePicker.Default, option);
-                }
+        static _jQueryHandleThis(me, option, argument) {
+            let data = $(me).data(DateTimePicker.DATA_KEY);
+            if (typeof option === 'object') {
+                $.extend({}, DateTimePicker.Default, option);
+            }
 
-                if (!data) {
-                    data = new TempusDominusBootstrap3($(this), option);
-                    $(this).data(DateTimePicker.DATA_KEY, data);
-                }
+            if (!data) {
+                data = new TempusDominusBootstrap3($(me), option);
+                $(me).data(DateTimePicker.DATA_KEY, data);
+            }
 
-                if (typeof option === 'string') {
-                    if (data[option] === undefined) {
-                        throw new Error(`No method named "${option}"`);
-                    }
-                    data[option](argument);
+            if (typeof option === 'string') {
+                if (data[option] === undefined) {
+                    throw new Error(`No method named "${option}"`);
+                }
+                if (argument === undefined) {
+                    return data[option]();
                 }
+                else {
+                    return data[option](argument);
+                }
+            }
+        }
+
+        static _jQueryInterface(option, argument) {
+            if (this.length === 1) {
+                return TempusDominusBootstrap3._jQueryHandleThis(this[0], option, argument);
+            }
+            return this.each(function () {
+                TempusDominusBootstrap3._jQueryHandleThis(this, option, argument);
             });
         }
     }