From 62a5da75134af37b119ac96ba730f09fc0f85cb4 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Thu, 27 Feb 2025 13:16:37 +1100 Subject: [PATCH] regression fix: quick search --- Disco.Web/ClientSource/Scripts/Core.js | 33 ++++++++++--------- Disco.Web/ClientSource/Scripts/Core.min.js | 2 +- .../ClientSource/Scripts/Core/disco.uicore.js | 33 ++++++++++--------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/Disco.Web/ClientSource/Scripts/Core.js b/Disco.Web/ClientSource/Scripts/Core.js index 772d9963..7041afba 100644 --- a/Disco.Web/ClientSource/Scripts/Core.js +++ b/Disco.Web/ClientSource/Scripts/Core.js @@ -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; //"" + item.DisplayName + "
" + item.Id + " (" + item.Type + ")" @@ -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); } } diff --git a/Disco.Web/ClientSource/Scripts/Core.min.js b/Disco.Web/ClientSource/Scripts/Core.min.js index 499b0c34..896e9b1d 100644 --- a/Disco.Web/ClientSource/Scripts/Core.min.js +++ b/Disco.Web/ClientSource/Scripts/Core.min.js @@ -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 nt?1:0},jQuery.fn.dataTableExt.oSort["au_date-desc"]=function(n,t){return nt?-1:0},jQuery.fn.dataTableExt.oSort["disco_datetime-asc"]=function(n,t){return nt?1:0},jQuery.fn.dataTableExt.oSort["disco_datetime-desc"]=function(n,t){return nt?-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").append('').append(n("").text("Device "+i.Id)).append(n("
").text(i.ComputerName+"; "+i.DeviceModelDescription));break;case"Job":i.DeviceSerialNumber&&i.UserId?r=n("").append('').append(n("").text("Job "+i.Id)).append(n("
").text(i.UserId+"; "+i.DeviceSerialNumber)):i.DeviceSerialNumber?r=n("").append('').append(n("").text("Job "+i.Id)).append(n("
").text(i.DeviceSerialNumber)):i.UserId&&(r=n("").append('').append(n("").text("Job "+i.Id)).append(n("
").text(i.UserId)));break;case"User":r=n("").append('').append(n("").text(i.DisplayName)).append(n("
").text(i.Id))}return n("
  • ").data("item.autocomplete",i).append(r).appendTo(t)});f=!0}}),u=n("#menu"),u.length>0){function f(){var i=n(this),r=i.children("ul"),u=i.data("menuHideToken");u&&t.clearTimeout(u);r.is(":visible")||r.show()}function e(){var i=n(this),r=i.children("ul"),u=t.setTimeout(function(){r.hide()},250);i.data("menuHideToken",u)}function o(t,i){var u=n(this),r=u.children("a"),f=u.children("ul"),i;if(!f.is(":visible")){if(f.show(),t.preventDefault(),t.stopPropagation(),i&&r.length>0){i=function(){return r.off("click",i),!1};r.on("click",i)}return!1}}if(r.hasEvent("pointerdown")){u.on("pointerover","li.d-sm",function(n){n.originalEvent.pointerType!=="touch"&&f.call(this)}).on("pointerout","li.d-sm",function(n){n.originalEvent.pointerType!=="touch"&&e.call(this)}).on("pointerdown","li.d-sm",function(n){if(n.originalEvent.pointerType==="touch")return o.call(this,n,!0)});n(i).on("pointerdown",function(t){t.originalEvent.pointerType==="touch"&&n(t.target).closest("#menu").length==0&&u.find("li.d-sm>ul.subMenu:visible").hide()})}else if(r.hasEvent("mspointerdown")){u.on("MSPointerOver","li.d-sm",function(n){n.originalEvent.pointerType!==n.originalEvent.MSPOINTER_TYPE_TOUCH&&f.call(this)}).on("MSPointerOut","li.d-sm",function(n){n.originalEvent.pointerType!==n.originalEvent.MSPOINTER_TYPE_TOUCH&&e.call(this)}).on("MSPointerDown","li.d-sm",function(n){if(n.originalEvent.pointerType===n.originalEvent.MSPOINTER_TYPE_TOUCH)return o.call(this,n,!0)});n(i).on("MSPointerDown",function(t){t.originalEvent.pointerType===t.originalEvent.MSPOINTER_TYPE_TOUCH&&n(t.target).closest("#menu").length==0&&u.find("li.d-sm>ul.subMenu:visible").hide()})}else if(r.touch)u.on("mouseover","li.d-sm",f).on("mouseout","li.d-sm",e).on("touchstart","li.d-sm",function(n){return o.call(this,n,!1)});else u.on("mouseover","li.d-sm",f).on("mouseout","li.d-sm",e)}n(t).resize(function(){n(".ui-dialog-content").filter(":visible").dialog("option","position","center")});navigator.clipboard&&t.setTimeout(()=>{n("[data-clipboard]:not(input)").on("mouseenter",t=>{const i=n(t.currentTarget),u=i.css("position");i.css("position","relative");const r=n('');r.appendTo(i);r.on("click",n=>{n.preventDefault();let t=i.attr("data-clipboard");return t||(t=i.text().trim()),navigator.clipboard.writeText(t).then(()=>{r.removeClass("fa-clipboard").addClass("fa-check")}),!1});i.data("clipboard",{previousPosition:u,link:r})}).on("mouseleave",t=>{const i=n(t.currentTarget),r=i.data("clipboard");r&&(r.link.remove(),i.css("position",r.previousPosition),i.removeData("clipboard"))});n("input[data-clipboard]").each((i,r)=>{const f=n(r),u=n('');u.insertAfter(f);u.on("click",n=>{n.preventDefault();const i=f.val();navigator.clipboard.writeText(i).then(()=>{u.removeClass("fa-clipboard").addClass("fa-check"),t.setTimeout(()=>{u.removeClass("fa-check").addClass("fa-clipboard")},1e3)})})})},100)})}(jQuery,window,document,Modernizr); \ No newline at end of file +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 nt?1:0},jQuery.fn.dataTableExt.oSort["au_date-desc"]=function(n,t){return nt?-1:0},jQuery.fn.dataTableExt.oSort["disco_datetime-asc"]=function(n,t){return nt?1:0},jQuery.fn.dataTableExt.oSort["disco_datetime-desc"]=function(n,t){return nt?-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").append('').append(n("").text("Device "+i.Id)).append(n("
  • ").data("item.autocomplete",i).append(r).appendTo(t)});f=!0}});const u=n("#menu");if(u.length>0){function f(){const i=n(this),r=i.children("ul"),u=i.data("menuHideToken");u&&t.clearTimeout(u);r.is(":visible")||r.show()}function e(){const i=n(this),r=i.children("ul");var u=t.setTimeout(function(){r.hide()},250);i.data("menuHideToken",u)}function o(t,i){const u=n(this),r=u.children("a"),f=u.children("ul");if(!f.is(":visible")){if(f.show(),t.preventDefault(),t.stopPropagation(),i&&r.length>0){const n=function(){return r.off("click",n),!1};r.on("click",n)}return!1}}if(r.hasEvent("pointerdown")){u.on("pointerover","li.d-sm",function(n){n.originalEvent.pointerType!=="touch"&&f.call(this)}).on("pointerout","li.d-sm",function(n){n.originalEvent.pointerType!=="touch"&&e.call(this)}).on("pointerdown","li.d-sm",function(n){if(n.originalEvent.pointerType==="touch")return o.call(this,n,!0)});n(i).on("pointerdown",function(t){t.originalEvent.pointerType==="touch"&&n(t.target).closest("#menu").length==0&&u.find("li.d-sm>ul.subMenu:visible").hide()})}else if(r.hasEvent("mspointerdown")){u.on("MSPointerOver","li.d-sm",function(n){n.originalEvent.pointerType!==n.originalEvent.MSPOINTER_TYPE_TOUCH&&f.call(this)}).on("MSPointerOut","li.d-sm",function(n){n.originalEvent.pointerType!==n.originalEvent.MSPOINTER_TYPE_TOUCH&&e.call(this)}).on("MSPointerDown","li.d-sm",function(n){if(n.originalEvent.pointerType===n.originalEvent.MSPOINTER_TYPE_TOUCH)return o.call(this,n,!0)});n(i).on("MSPointerDown",function(t){t.originalEvent.pointerType===t.originalEvent.MSPOINTER_TYPE_TOUCH&&n(t.target).closest("#menu").length==0&&u.find("li.d-sm>ul.subMenu:visible").hide()})}else if(r.touch)u.on("mouseover","li.d-sm",f).on("mouseout","li.d-sm",e).on("touchstart","li.d-sm",function(n){return o.call(this,n,!1)});else u.on("mouseover","li.d-sm",f).on("mouseout","li.d-sm",e)}n(t).resize(function(){n(".ui-dialog-content").filter(":visible").dialog("option","position","center")});navigator.clipboard&&t.setTimeout(()=>{n("[data-clipboard]:not(input)").on("mouseenter",t=>{const i=n(t.currentTarget),u=i.css("position");i.css("position","relative");const r=n('');r.appendTo(i);r.on("click",n=>{n.preventDefault();let t=i.attr("data-clipboard");return t||(t=i.text().trim()),navigator.clipboard.writeText(t).then(()=>{r.removeClass("fa-clipboard").addClass("fa-check")}),!1});i.data("clipboard",{previousPosition:u,link:r})}).on("mouseleave",t=>{const i=n(t.currentTarget),r=i.data("clipboard");r&&(r.link.remove(),i.css("position",r.previousPosition),i.removeData("clipboard"))});n("input[data-clipboard]").each((i,r)=>{const f=n(r),u=n('');u.insertAfter(f);u.on("click",n=>{n.preventDefault();const i=f.val();navigator.clipboard.writeText(i).then(()=>{u.removeClass("fa-clipboard").addClass("fa-check"),t.setTimeout(()=>{u.removeClass("fa-check").addClass("fa-clipboard")},1e3)})})})},100)})}(jQuery,window,document,Modernizr); \ No newline at end of file diff --git a/Disco.Web/ClientSource/Scripts/Core/disco.uicore.js b/Disco.Web/ClientSource/Scripts/Core/disco.uicore.js index a993eb60..755e1519 100644 --- a/Disco.Web/ClientSource/Scripts/Core/disco.uicore.js +++ b/Disco.Web/ClientSource/Scripts/Core/disco.uicore.js @@ -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; //"" + item.DisplayName + "
    " + item.Id + " (" + item.Type + ")    " @@ -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); } }