regression fix: quick search

2025-02-27 13:16:37 +11:00
1 parent eb3ed7f819
commit 62a5da7513
@@ -58474,18 +58474,19 @@ jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, 100, 200, -1], [10, 20,
    $(function () {

        // Search Functionality
-        var quickSearchInited = false;
-        $('#SearchQuery').watermark('Search').keypress(function (e) {
+        let quickSearchInited = false;
+        $('#SearchQuery').keypress(function (e) {
            if (e.keyCode == 13) {
+                e.preventDefault();
                $(this).closest('form').submit();
                return false;
            }
        }).focus(function () {
-            $this = $(this);
+            const $this = $(this);
            $this.select();

            if (!quickSearchInited) {
-                var quickSearchUrl = $this.attr('data-quicksearchurl');
+                const quickSearchUrl = $this.attr('data-quicksearchurl');
                if (quickSearchUrl) {
                    $this.autocomplete({
                        source: quickSearchUrl,
@@ -58496,7 +58497,7 @@ jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, 100, 200, -1], [10, 20,
                        },
                        response: function (e, ui) {
                            for (var i = 0; i < ui.content.length; i++) {
-                                var item = ui.content[i];
+                                const item = ui.content[i];
                                switch (item.Type) {
                                    case 'Device':
                                        item.tag = '!' + item.Id;
@@ -58513,7 +58514,7 @@ jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, 100, 200, -1], [10, 20,
                    }).autocomplete("widget").attr('id', 'QuickSearchMenu');

                    $this.data('ui-autocomplete')._renderItem = function (ul, item) {
-                        var template;
+                        let template;

                        //"<a><strong>" + item.DisplayName + "</strong><br>" + item.Id + " (" + item.Type + ")</a>"

@@ -58547,14 +58548,14 @@ jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, 100, 200, -1], [10, 20,
        });

        // Menu Functionality
-        var $menu = $('#menu');
+        const $menu = $('#menu');

        if ($menu.length > 0) {

            function subMenuShow() {
-                var $this = $(this);
-                var $subMenu = $this.children('ul');
-                var hideToken = $this.data('menuHideToken');
+                const $this = $(this);
+                const $subMenu = $this.children('ul');
+                const hideToken = $this.data('menuHideToken');

                if (hideToken)
                    window.clearTimeout(hideToken);
@@ -58563,8 +58564,8 @@ jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, 100, 200, -1], [10, 20,
                    $subMenu.show();
            }
            function subMenuHide() {
-                var $this = $(this);
-                var $subMenu = $this.children('ul');
+                const $this = $(this);
+                const $subMenu = $this.children('ul');

                var hideToken = window.setTimeout(function () {
                    $subMenu.hide();
@@ -58573,9 +58574,9 @@ jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, 100, 200, -1], [10, 20,
                $this.data('menuHideToken', hideToken);
            }
            function subMenuTouchDown(e, preventClick) {
-                var $this = $(this);
-                var $link = $this.children('a');
-                var $subMenu = $this.children('ul');
+                const $this = $(this);
+                const $link = $this.children('a');
+                const $subMenu = $this.children('ul');

                if (!$subMenu.is(':visible')) {

@@ -58587,7 +58588,7 @@ jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, 100, 200, -1], [10, 20,
                    if (preventClick) {
                        // Stop Click Event
                        if ($link.length > 0) {
-                            var preventClick = function () { $link.off('click', preventClick); return false; }
+                            const preventClick = function () { $link.off('click', preventClick); return false; }
                            $link.on('click', preventClick);
                        }
                    }
@@ -325,4 +325,4 @@ n.defineLocale("zh-hk",{months:"一月_二月_三月_四月_五月_六月_七月
 //! moment.js locale configuration
 n.defineLocale("zh-mo",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"YYYY年M月D日",LLL:"YYYY年M月D日 HH:mm",LLLL:"YYYY年M月D日dddd HH:mm",l:"D/M/YYYY",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},meridiemParse:/凌晨|早上|上午|中午|下午|晚上/,meridiemHour:function(n,t){return(n===12&&(n=0),t==="凌晨"||t==="早上"||t==="上午")?n:t==="中午"?n>=11?n:n+12:t==="下午"||t==="晚上"?n+12:void 0},meridiem:function(n,t){var i=n*100+t;return i<600?"凌晨":i<900?"早上":i<1130?"上午":i<1230?"中午":i<1800?"下午":"晚上"},calendar:{sameDay:"[今天] LT",nextDay:"[明天] LT",nextWeek:"[下]dddd LT",lastDay:"[昨天] LT",lastWeek:"[上]dddd LT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(日|月|週)/,ordinal:function(n,t){switch(t){case"d":case"D":case"DDD":return n+"日";case"M":return n+"月";case"w":case"W":return n+"週";default:return n}},relativeTime:{future:"%s內",past:"%s前",s:"幾秒",ss:"%d 秒",m:"1 分鐘",mm:"%d 分鐘",h:"1 小時",hh:"%d 小時",d:"1 天",dd:"%d 天",M:"1 個月",MM:"%d 個月",y:"1 年",yy:"%d 年"}});
 //! moment.js locale configuration
-return n.defineLocale("zh-tw",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日 HH:mm",LLLL:"YYYY年M月D日dddd HH:mm",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},meridiemParse:/凌晨|早上|上午|中午|下午|晚上/,meridiemHour:function(n,t){return(n===12&&(n=0),t==="凌晨"||t==="早上"||t==="上午")?n:t==="中午"?n>=11?n:n+12:t==="下午"||t==="晚上"?n+12:void 0},meridiem:function(n,t){var i=n*100+t;return i<600?"凌晨":i<900?"早上":i<1130?"上午":i<1230?"中午":i<1800?"下午":"晚上"},calendar:{sameDay:"[今天] LT",nextDay:"[明天] LT",nextWeek:"[下]dddd LT",lastDay:"[昨天] LT",lastWeek:"[上]dddd LT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(日|月|週)/,ordinal:function(n,t){switch(t){case"d":case"D":case"DDD":return n+"日";case"M":return n+"月";case"w":case"W":return n+"週";default:return n}},relativeTime:{future:"%s後",past:"%s前",s:"幾秒",ss:"%d 秒",m:"1 分鐘",mm:"%d 分鐘",h:"1 小時",hh:"%d 小時",d:"1 天",dd:"%d 天",M:"1 個月",MM:"%d 個月",y:"1 年",yy:"%d 年"}}),n.locale("en"),n}),moment.locale("en-au"),function(n){typeof define=="function"&&define.amd?define(["jquery","moment"],n):n(jQuery,moment)}(function(n,t){var u=3e4,f=!1,i=n([]),h=function(){r.resume()},e=function(r,u){var e=r.data("livestampdata"),f;r.removeAttr("data-livestamp").removeData("livestamp");u=t(u);t.isMoment(u)&&!isNaN(+u)&&(f=n.extend({},{original:r.contents()},e),f.moment=t(u),f.fromNowWithoutSuffix=r.hasClass("noMomentSuffix"),r.data("livestampdata",f).empty(),i.push(r[0]))},o=function(){f||(r.update(),setTimeout(o,u))},r={update:function(){n("[data-livestamp]").each(function(){var t=n(this);e(t,t.data("livestamp"))});var r=[];i.each(function(){var i=n(this),u=i.data("livestampdata"),e,f,o;u===undefined?r.push(this):t.isMoment(u.moment)&&(e=i.html(),f=u.moment.fromNow(u.fromNowWithoutSuffix),e!=f&&(o=n.Event("change.livestamp"),i.trigger(o,[e,f]),o.isDefaultPrevented()||i.html(f)))});i=i.not(r);delete i.prevObject},pause:function(){f=!0},resume:function(){f=!1;o()},interval:function(n){if(n===undefined)return u;u=n}},s={add:function(i,u){return u=t(u),t.isMoment(u)&&!isNaN(+u)&&(i.each(function(){e(n(this),u)}),r.update()),i},destroy:function(t){return i=i.not(t),t.each(function(){var r=n(this),i=r.data("livestampdata");if(i===undefined)return t;r.html(i.original?i.original:"").removeData("livestampdata")}),t},isLivestamp:function(n){return n.data("livestampdata")!==undefined}};n.livestamp=r;n(h);n.fn.livestamp=function(n,t){return s[n]||(t=n,n="add"),s[n](this,t)}}),jQuery.fn.dataTableExt.afnSortData.text=function(n,t){var i=[];return $("td:eq("+t+")",n.oApi._fnGetTrNodes(n)).each(function(){i.push(jQuery.trim($(this).text()))}),i},jQuery.fn.dataTableExt.afnSortData.disco_datetime=function(n,t){var i=[];return $("td:eq("+t+")",n.oApi._fnGetTrNodes(n)).each(function(){var n=$(this).children("span.date");n.length>0?n.is("[data-livestamp]")?i.push(n.attr("data-livestamp")*1):n.data("livestampdata")!==undefined?i.push(n.data("livestampdata").moment.valueOf()):i.push(-1):i.push(-1)}),i},jQuery.fn.dataTableExt.oSort["au_date-pre"]=function(n){var t=n.split("/");return(t[2]+t[1]+t[0])*1},jQuery.fn.dataTableExt.oSort["au_date-asc"]=function(n,t){return n<t?-1:n>t?1:0},jQuery.fn.dataTableExt.oSort["au_date-desc"]=function(n,t){return n<t?1:n>t?-1:0},jQuery.fn.dataTableExt.oSort["disco_datetime-asc"]=function(n,t){return n<t?-1:n>t?1:0},jQuery.fn.dataTableExt.oSort["disco_datetime-desc"]=function(n,t){return n<t?1:n>t?-1:0},jQuery.fn.DataTable.defaults.iDisplayLength=20,window.localStorage){var length=20,lengthString=window.localStorage.getItem("datatable_default_length");!lengthString||(length=parseInt(lengthString));jQuery.fn.DataTable.defaults.iDisplayLength=parseInt(length);jQuery.fn.DataTable.defaults.fnPreDrawCallback=function(n){var t=n._iDisplayLength;length!==t&&window.localStorage.setItem("datatable_default_length",t)}}jQuery.fn.DataTable.defaults.aLengthMenu=[[10,20,50,100,200,-1],[10,20,50,100,200,"All"]],function(n,t,i,r){n(function(){var f=!1,u;if(n("#SearchQuery").watermark("Search").keypress(function(t){if(t.keyCode==13)return n(this).closest("form").submit(),!1}).focus(function(){if($this=n(this),$this.select(),!f){var t=$this.attr("data-quicksearchurl");t&&($this.autocomplete({source:t,minLength:2,select:function(n,t){$this.val(t.item.tag);$this.closest("form").submit()},response:function(n,t){for(var i,r=0;r<t.content.length;r++){i=t.content[r];switch(Line truncated
+return n.defineLocale("zh-tw",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日 HH:mm",LLLL:"YYYY年M月D日dddd HH:mm",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},meridiemParse:/凌晨|早上|上午|中午|下午|晚上/,meridiemHour:function(n,t){return(n===12&&(n=0),t==="凌晨"||t==="早上"||t==="上午")?n:t==="中午"?n>=11?n:n+12:t==="下午"||t==="晚上"?n+12:void 0},meridiem:function(n,t){var i=n*100+t;return i<600?"凌晨":i<900?"早上":i<1130?"上午":i<1230?"中午":i<1800?"下午":"晚上"},calendar:{sameDay:"[今天] LT",nextDay:"[明天] LT",nextWeek:"[下]dddd LT",lastDay:"[昨天] LT",lastWeek:"[上]dddd LT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(日|月|週)/,ordinal:function(n,t){switch(t){case"d":case"D":case"DDD":return n+"日";case"M":return n+"月";case"w":case"W":return n+"週";default:return n}},relativeTime:{future:"%s後",past:"%s前",s:"幾秒",ss:"%d 秒",m:"1 分鐘",mm:"%d 分鐘",h:"1 小時",hh:"%d 小時",d:"1 天",dd:"%d 天",M:"1 個月",MM:"%d 個月",y:"1 年",yy:"%d 年"}}),n.locale("en"),n}),moment.locale("en-au"),function(n){typeof define=="function"&&define.amd?define(["jquery","moment"],n):n(jQuery,moment)}(function(n,t){var u=3e4,f=!1,i=n([]),h=function(){r.resume()},e=function(r,u){var e=r.data("livestampdata"),f;r.removeAttr("data-livestamp").removeData("livestamp");u=t(u);t.isMoment(u)&&!isNaN(+u)&&(f=n.extend({},{original:r.contents()},e),f.moment=t(u),f.fromNowWithoutSuffix=r.hasClass("noMomentSuffix"),r.data("livestampdata",f).empty(),i.push(r[0]))},o=function(){f||(r.update(),setTimeout(o,u))},r={update:function(){n("[data-livestamp]").each(function(){var t=n(this);e(t,t.data("livestamp"))});var r=[];i.each(function(){var i=n(this),u=i.data("livestampdata"),e,f,o;u===undefined?r.push(this):t.isMoment(u.moment)&&(e=i.html(),f=u.moment.fromNow(u.fromNowWithoutSuffix),e!=f&&(o=n.Event("change.livestamp"),i.trigger(o,[e,f]),o.isDefaultPrevented()||i.html(f)))});i=i.not(r);delete i.prevObject},pause:function(){f=!0},resume:function(){f=!1;o()},interval:function(n){if(n===undefined)return u;u=n}},s={add:function(i,u){return u=t(u),t.isMoment(u)&&!isNaN(+u)&&(i.each(function(){e(n(this),u)}),r.update()),i},destroy:function(t){return i=i.not(t),t.each(function(){var r=n(this),i=r.data("livestampdata");if(i===undefined)return t;r.html(i.original?i.original:"").removeData("livestampdata")}),t},isLivestamp:function(n){return n.data("livestampdata")!==undefined}};n.livestamp=r;n(h);n.fn.livestamp=function(n,t){return s[n]||(t=n,n="add"),s[n](this,t)}}),jQuery.fn.dataTableExt.afnSortData.text=function(n,t){var i=[];return $("td:eq("+t+")",n.oApi._fnGetTrNodes(n)).each(function(){i.push(jQuery.trim($(this).text()))}),i},jQuery.fn.dataTableExt.afnSortData.disco_datetime=function(n,t){var i=[];return $("td:eq("+t+")",n.oApi._fnGetTrNodes(n)).each(function(){var n=$(this).children("span.date");n.length>0?n.is("[data-livestamp]")?i.push(n.attr("data-livestamp")*1):n.data("livestampdata")!==undefined?i.push(n.data("livestampdata").moment.valueOf()):i.push(-1):i.push(-1)}),i},jQuery.fn.dataTableExt.oSort["au_date-pre"]=function(n){var t=n.split("/");return(t[2]+t[1]+t[0])*1},jQuery.fn.dataTableExt.oSort["au_date-asc"]=function(n,t){return n<t?-1:n>t?1:0},jQuery.fn.dataTableExt.oSort["au_date-desc"]=function(n,t){return n<t?1:n>t?-1:0},jQuery.fn.dataTableExt.oSort["disco_datetime-asc"]=function(n,t){return n<t?-1:n>t?1:0},jQuery.fn.dataTableExt.oSort["disco_datetime-desc"]=function(n,t){return n<t?1:n>t?-1:0},jQuery.fn.DataTable.defaults.iDisplayLength=20,window.localStorage){var length=20,lengthString=window.localStorage.getItem("datatable_default_length");!lengthString||(length=parseInt(lengthString));jQuery.fn.DataTable.defaults.iDisplayLength=parseInt(length);jQuery.fn.DataTable.defaults.fnPreDrawCallback=function(n){var t=n._iDisplayLength;length!==t&&window.localStorage.setItem("datatable_default_length",t)}}jQuery.fn.DataTable.defaults.aLengthMenu=[[10,20,50,100,200,-1],[10,20,50,100,200,"All"]],function(n,t,i,r){n(function(){let f=!1;n("#SearchQuery").keypress(function(t){if(t.keyCode==13)return t.preventDefault(),n(this).closest("form").submit(),!1}).focus(function(){const t=n(this);if(t.select(),!f){const i=t.attr("data-quicksearchurl");i&&(t.autocomplete({source:i,minLength:2,select:function(n,i){t.val(i.item.tag);t.closest("form").submit()},response:function(n,t){for(var i=0;i<t.content.length;i++){const n=t.content[i];switch(n.Type){case"DevicLine truncated
@@ -4,18 +4,19 @@
    $(function () {

        // Search Functionality
-        var quickSearchInited = false;
-        $('#SearchQuery').watermark('Search').keypress(function (e) {
+        let quickSearchInited = false;
+        $('#SearchQuery').keypress(function (e) {
            if (e.keyCode == 13) {
+                e.preventDefault();
                $(this).closest('form').submit();
                return false;
            }
        }).focus(function () {
-            $this = $(this);
+            const $this = $(this);
            $this.select();

            if (!quickSearchInited) {
-                var quickSearchUrl = $this.attr('data-quicksearchurl');
+                const quickSearchUrl = $this.attr('data-quicksearchurl');
                if (quickSearchUrl) {
                    $this.autocomplete({
                        source: quickSearchUrl,
@@ -26,7 +27,7 @@
                        },
                        response: function (e, ui) {
                            for (var i = 0; i < ui.content.length; i++) {
-                                var item = ui.content[i];
+                                const item = ui.content[i];
                                switch (item.Type) {
                                    case 'Device':
                                        item.tag = '!' + item.Id;
@@ -43,7 +44,7 @@
                    }).autocomplete("widget").attr('id', 'QuickSearchMenu');

                    $this.data('ui-autocomplete')._renderItem = function (ul, item) {
-                        var template;
+                        let template;

                        //"<a><strong>" + item.DisplayName + "</strong><br>" + item.Id + " (" + item.Type + ")</a>"

@@ -77,14 +78,14 @@
        });

        // Menu Functionality
-        var $menu = $('#menu');
+        const $menu = $('#menu');

        if ($menu.length > 0) {

            function subMenuShow() {
-                var $this = $(this);
-                var $subMenu = $this.children('ul');
-                var hideToken = $this.data('menuHideToken');
+                const $this = $(this);
+                const $subMenu = $this.children('ul');
+                const hideToken = $this.data('menuHideToken');

                if (hideToken)
                    window.clearTimeout(hideToken);
@@ -93,8 +94,8 @@
                    $subMenu.show();
            }
            function subMenuHide() {
-                var $this = $(this);
-                var $subMenu = $this.children('ul');
+                const $this = $(this);
+                const $subMenu = $this.children('ul');

                var hideToken = window.setTimeout(function () {
                    $subMenu.hide();
@@ -103,9 +104,9 @@
                $this.data('menuHideToken', hideToken);
            }
            function subMenuTouchDown(e, preventClick) {
-                var $this = $(this);
-                var $link = $this.children('a');
-                var $subMenu = $this.children('ul');
+                const $this = $(this);
+                const $link = $this.children('a');
+                const $subMenu = $this.children('ul');

                if (!$subMenu.is(':visible')) {

@@ -117,7 +118,7 @@
                    if (preventClick) {
                        // Stop Click Event
                        if ($link.length > 0) {
-                            var preventClick = function () { $link.off('click', preventClick); return false; }
+                            const preventClick = function () { $link.off('click', preventClick); return false; }
                            $link.on('click', preventClick);
                        }
                    }