diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/HeadInlineJS.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/HeadInlineJS.php index 798d1fac5..f4f0b117c 100644 --- a/emhttp/plugins/dynamix/include/DefaultPageLayout/HeadInlineJS.php +++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/HeadInlineJS.php @@ -477,32 +477,6 @@ function digits(number) { return 'three'; } -function openNotifier() { - $.post('/webGui/include/Notify.php',{cmd:'get',csrf_token:csrf_token},function(msg) { - $.each($.parseJSON(msg), function(i, notify){ - $.jGrowl(notify.subject+'
'+notify.description,{ - group: notify.importance, - header: notify.event+': '+notify.timestamp, - theme: notify.file, - sticky: true, - beforeOpen: function(e,m,o){if ($('div.jGrowl-notification').hasClass(notify.file)) return(false);}, - afterOpen: function(e,m,o){if (notify.link) $(e).css('cursor','pointer');}, - click: function(e,m,o){if (notify.link) location.replace(notify.link);}, - close: function(e,m,o){$.post('/webGui/include/Notify.php',{cmd:'archive',file:notify.file,csrf_token:csrf_token});} - }); - }); - }); -} - -function closeNotifier() { - $.post('/webGui/include/Notify.php',{cmd:'get',csrf_token:csrf_token},function(msg) { - $.each($.parseJSON(msg), function(i, notify){ - $.post('/webGui/include/Notify.php',{cmd:'archive',file:notify.file,csrf_token:csrf_token}); - }); - $('div.jGrowl').find('div.jGrowl-close').trigger('click'); - }); -} - function viewHistory() { location.replace('/Tools/NotificationsArchive'); } @@ -536,17 +510,7 @@ $(function() { } $('#'+tab).attr('checked', true); updateTime(); - $.jGrowl.defaults.closeTemplate = ''; - $.jGrowl.defaults.closerTemplate = '':'
'?>[ ]
'; - $.jGrowl.defaults.position = ''; - $.jGrowl.defaults.theme = ''; - $.jGrowl.defaults.themeState = ''; - $.jGrowl.defaults.pool = 10; - 0):?> - $.jGrowl.defaults.life = ; - - $.jGrowl.defaults.sticky = true; - + Shadowbox.setup('a.sb-enable', {modal:true}); // add any pre-existing reboot notices $.post('/webGui/include/Report.php',{cmd:'notice'},function(notices){ diff --git a/emhttp/plugins/dynamix/javascript/dynamix.js b/emhttp/plugins/dynamix/javascript/dynamix.js index ce177787d..552f1a4b6 100644 --- a/emhttp/plugins/dynamix/javascript/dynamix.js +++ b/emhttp/plugins/dynamix/javascript/dynamix.js @@ -14,9 +14,6 @@ /* NchanSubscriber - v1.0.10 , copyright Nchan.io LATEST */ !function(t,e){"use strict";var s=e(t);"object"==typeof module&&null!=module&&module.exports?module.exports=s:"function"==typeof define&&define.amd?define(function(){return s}):t.NchanSubscriber=s}("undefined"!=typeof window?window:this,function(d,p){var m,i={};function f(t,e,s){t[e]=t[e]||s}function s(t){return t?function(t){for(var e in s.prototype)t[e]=s.prototype[e];return t}(t):void 0}m=["responseType","withCredentials","timeout","onprogress"],i.ajax=function(t,s){var e=t.headers||{},i=t.body,n=t.method||(i?"POST":"GET"),r=!1,o=function(t){if(t&&d.XDomainRequest&&!/MSIE 1/.test(navigator.userAgent))return new XDomainRequest;if(d.XMLHttpRequest)return new XMLHttpRequest}(t.cors);function a(t,e){return function(){r||(s(o.status===p?t:o.status,0===o.status?"Error":o.response||o.responseText||e,o),r=!0)}}o.open(n,t.url,!0);var h=o.onload=a(200);o.onreadystatechange=function(){4===o.readyState&&h()},o.onerror=a(null,"Error"),o.ontimeout=a(null,"Timeout"),o.onabort=a(null,"Abort"),i&&(f(e,"X-Requested-With","XMLHttpRequest"),d.FormData&&i instanceof d.FormData||f(e,"Content-Type","application/x-www-form-urlencoded"));for(var c,l=0,u=m.length;l(new Date).getTime()-4e3)&&s&&(!i||i').addClass(t&&t.position?t.position:a.jGrowl.defaults.position).appendTo(t&&t.appendTo?t.appendTo:a.jGrowl.defaults.appendTo),a("#jGrowl").jGrowl(e,t)},a.fn.jGrowl=function(e,t){if(void 0===t&&a.isPlainObject(e)&&(e=(t=e).message),a.isFunction(this.each)){var i=arguments;return this.each(function(){void 0===a(this).data("jGrowl.instance")&&(a(this).data("jGrowl.instance",a.extend(new a.fn.jGrowl,{notifications:[],element:null,interval:null})),a(this).data("jGrowl.instance").startup(this)),a.isFunction(a(this).data("jGrowl.instance")[e])?a(this).data("jGrowl.instance")[e].apply(a(this).data("jGrowl.instance"),a.makeArray(i).slice(1)):a(this).data("jGrowl.instance").create(e,t)})}},a.extend(a.fn.jGrowl.prototype,{defaults:{pool:0,header:"",group:"",sticky:!1,position:"top-right",appendTo:"body",glue:"after",theme:"default",themeState:"highlight",corners:"10px",check:250,life:3e3,closeDuration:"normal",openDuration:"normal",easing:"swing",closer:!0,closeTemplate:"×",closerTemplate:"
[ close all ]
",log:function(){},beforeOpen:function(){},afterOpen:function(){},open:function(){},beforeClose:function(){},close:function(){},click:function(){},animateOpen:{opacity:"show"},animateClose:{opacity:"hide"}},notifications:[],element:null,interval:null,create:function(e,t){var i=a.extend({},this.defaults,t);void 0!==i.speed&&(i.openDuration=i.speed,i.closeDuration=i.speed),this.notifications.push({message:e,options:i}),i.log.apply(this.element,[this.element,e,i])},render:function(e){var t=this,i=e.message,n=e.options;n.themeState=""===n.themeState?"":"ui-state-"+n.themeState;var o=a("
").addClass("jGrowl-notification alert "+n.themeState+" ui-corner-all"+(void 0!==n.group&&""!==n.group?" "+n.group:"")).append(a("