").text(i.Id))}return 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);
}
}