diff --git a/libraries.txt b/libraries.txt index 0e1ab7ea4..21a5537b3 100644 --- a/libraries.txt +++ b/libraries.txt @@ -7,7 +7,7 @@ QT 4.6.2+ LGPL v2.1/3 http://www.qt.io/ Bootstrap 3.3.4 MIT http://getbootstrap.com/ jQuery 1.11.1 MIT http://jquery.com/ Modernizr 2.6.2 MIT/BSD http://modernizr.com/ -AlertifyJS 1.7.0 MIT http://alertifyjs.com/ +AlertifyJS 1.7.1 MIT http://alertifyjs.com/ CodeMirror 5.14.2 MIT http://codemirror.net/ aciTree 4.5.0-rc.7 MIT/GPL http://acoderinsights.ro/en/aciTree-tree-view-with-jQuery contextMenu 2.1.0 MIT https://github.com/swisnl/jQuery-contextMenu diff --git a/web/pgadmin/static/css/alertifyjs/alertify.css b/web/pgadmin/static/css/alertifyjs/alertify.css index d7f476e81..74905e24b 100644 --- a/web/pgadmin/static/css/alertifyjs/alertify.css +++ b/web/pgadmin/static/css/alertifyjs/alertify.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/alertify.min.css b/web/pgadmin/static/css/alertifyjs/alertify.min.css index ebc8b99c0..5b19693c5 100644 --- a/web/pgadmin/static/css/alertifyjs/alertify.min.css +++ b/web/pgadmin/static/css/alertifyjs/alertify.min.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/alertify.rtl.css b/web/pgadmin/static/css/alertifyjs/alertify.rtl.css index 413fef5fb..c978fe24e 100644 --- a/web/pgadmin/static/css/alertifyjs/alertify.rtl.css +++ b/web/pgadmin/static/css/alertifyjs/alertify.rtl.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/alertify.rtl.min.css b/web/pgadmin/static/css/alertifyjs/alertify.rtl.min.css index 8fb642874..d5c777ddf 100644 --- a/web/pgadmin/static/css/alertifyjs/alertify.rtl.min.css +++ b/web/pgadmin/static/css/alertifyjs/alertify.rtl.min.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/bootstrap.css b/web/pgadmin/static/css/alertifyjs/themes/bootstrap.css index bd6891020..f3e00d977 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/bootstrap.css +++ b/web/pgadmin/static/css/alertifyjs/themes/bootstrap.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/bootstrap.min.css b/web/pgadmin/static/css/alertifyjs/themes/bootstrap.min.css index 237a34ef5..a91043dc9 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/bootstrap.min.css +++ b/web/pgadmin/static/css/alertifyjs/themes/bootstrap.min.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/bootstrap.rtl.css b/web/pgadmin/static/css/alertifyjs/themes/bootstrap.rtl.css index c9ae9f5c2..b6226e719 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/bootstrap.rtl.css +++ b/web/pgadmin/static/css/alertifyjs/themes/bootstrap.rtl.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/bootstrap.rtl.min.css b/web/pgadmin/static/css/alertifyjs/themes/bootstrap.rtl.min.css index 909e68fa6..a35cdda19 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/bootstrap.rtl.min.css +++ b/web/pgadmin/static/css/alertifyjs/themes/bootstrap.rtl.min.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/default.css b/web/pgadmin/static/css/alertifyjs/themes/default.css index 12e1da5ab..d25b0e0e1 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/default.css +++ b/web/pgadmin/static/css/alertifyjs/themes/default.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/default.min.css b/web/pgadmin/static/css/alertifyjs/themes/default.min.css index 8de86e108..ea815e9f6 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/default.min.css +++ b/web/pgadmin/static/css/alertifyjs/themes/default.min.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/default.rtl.css b/web/pgadmin/static/css/alertifyjs/themes/default.rtl.css index afb21e802..9e38b5adf 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/default.rtl.css +++ b/web/pgadmin/static/css/alertifyjs/themes/default.rtl.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/default.rtl.min.css b/web/pgadmin/static/css/alertifyjs/themes/default.rtl.min.css index e378f16d7..b1c6a01c5 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/default.rtl.min.css +++ b/web/pgadmin/static/css/alertifyjs/themes/default.rtl.min.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/semantic.css b/web/pgadmin/static/css/alertifyjs/themes/semantic.css index 146424d6f..97e8002d7 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/semantic.css +++ b/web/pgadmin/static/css/alertifyjs/themes/semantic.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/semantic.min.css b/web/pgadmin/static/css/alertifyjs/themes/semantic.min.css index 292cf3369..96b6c34a0 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/semantic.min.css +++ b/web/pgadmin/static/css/alertifyjs/themes/semantic.min.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/semantic.rtl.css b/web/pgadmin/static/css/alertifyjs/themes/semantic.rtl.css index 36605d70d..170e98e61 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/semantic.rtl.css +++ b/web/pgadmin/static/css/alertifyjs/themes/semantic.rtl.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/css/alertifyjs/themes/semantic.rtl.min.css b/web/pgadmin/static/css/alertifyjs/themes/semantic.rtl.min.css index 756db3325..6331d9b61 100644 --- a/web/pgadmin/static/css/alertifyjs/themes/semantic.rtl.min.css +++ b/web/pgadmin/static/css/alertifyjs/themes/semantic.rtl.min.css @@ -1,5 +1,5 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ diff --git a/web/pgadmin/static/js/alertifyjs/alertify.js b/web/pgadmin/static/js/alertifyjs/alertify.js index deac664c5..516f25449 100644 --- a/web/pgadmin/static/js/alertifyjs/alertify.js +++ b/web/pgadmin/static/js/alertifyjs/alertify.js @@ -1,11 +1,11 @@ /** - * alertifyjs 1.7.0 http://alertifyjs.com + * alertifyjs 1.7.1 http://alertifyjs.com * AlertifyJS is a javascript framework for developing pretty browser dialogs and notifications. - * Copyright 2016 Mohammad Younes (http://alertifyjs.com) + * Copyright 2016 Mohammad Younes (http://alertifyjs.com) * Licensed under MIT */ ( function ( window ) { 'use strict'; - + /** * Keys enum * @type {Object} @@ -19,7 +19,7 @@ RIGHT: 39 }; /** - * Default options + * Default options * @type {Object} */ var defaults = { @@ -62,7 +62,7 @@ cancel:'ajs-cancel', } }; - + //holds open dialogs instances var openDialogs = []; @@ -71,19 +71,19 @@ * * @element {node} The element * @className {string} One or more space-separated classes to be added to the class attribute of the element. - * + * * @return {undefined} */ function addClass(element,classNames){ element.className += ' ' + classNames; } - + /** * [Helper] Removes the specified class(es) from the element. * * @element {node} The element * @className {string} One or more space-separated classes to be removed from the class attribute of the element. - * + * * @return {undefined} */ function removeClass(element, classNames) { @@ -153,11 +153,11 @@ } return cpy; } - + if(src instanceof Date){ return new Date(src.getTime()); } - + if(src instanceof RegExp){ cpy = new RegExp(src.source); cpy.global = src.global; @@ -166,7 +166,7 @@ cpy.lastIndex = src.lastIndex; return cpy; } - + if(typeof src === 'object'){ cpy = {}; // copy dialog pototype over definition. @@ -285,7 +285,7 @@ /** * Creates event handler delegate that sends the instance as last argument. - * + * * @return {Function} a function wrapper which sends the instance as last argument. */ function delegate(context, method) { @@ -303,7 +303,7 @@ } /** * Helper for creating a dialog close event. - * + * * @return {object} */ function createCloseEvent(index, button) { @@ -383,31 +383,31 @@ basic:'ajs-basic', frameless:'ajs-frameless' }; - + /** * Helper: initializes the dialog instance - * + * * @return {Number} The total count of currently open modals. */ function initialize(instance){ - + if(!instance.__internal){ - + //no need to expose init after this. delete instance.__init; - + //keep a copy of initial dialog settings if(!instance.__settings){ instance.__settings = copy(instance.settings); } //in case the script was included before body. - //after first dialog gets initialized, it won't be null anymore! + //after first dialog gets initialized, it won't be null anymore! if(null === reflow){ // set tabindex attribute on body element this allows script to give it // focus after the dialog is closed document.body.setAttribute( 'tabindex', '0' ); } - + //get dialog buttons/focus setup var setup; if(typeof instance.setup === 'function'){ @@ -425,7 +425,7 @@ } }; } - + //initialize hooks object. if(typeof instance.hooks !== 'object'){ instance.hooks = {}; @@ -449,7 +449,7 @@ var internal = instance.__internal = { /** * Flag holding the open state of the dialog - * + * * @type {Boolean} */ isOpen:false, @@ -506,19 +506,19 @@ transitionOutHandler:undefined, destroy:undefined }; - - + + var elements = {}; //root node elements.root = document.createElement('div'); - + elements.root.className = classes.base + ' ' + classes.hidden + ' '; - + elements.root.innerHTML = templates.dimmer + templates.modal; - + //dimmer elements.dimmer = elements.root.firstChild; - + //dialog elements.modal = elements.root.lastChild; elements.modal.innerHTML = templates.dialog; @@ -529,14 +529,14 @@ elements.reset = []; elements.reset.push(elements.dialog.firstChild); elements.reset.push(elements.dialog.lastChild); - + //commands elements.commands = {}; elements.commands.container = elements.reset[0].nextSibling; elements.commands.pin = elements.commands.container.firstChild; elements.commands.maximize = elements.commands.pin.nextSibling; elements.commands.close = elements.commands.maximize.nextSibling; - + //header elements.header = elements.commands.container.nextSibling; @@ -548,7 +548,7 @@ //footer elements.footer = elements.body.nextSibling; elements.footer.innerHTML = templates.buttons.auxiliary + templates.buttons.primary; - + //resize handle elements.resizeHandle = elements.footer.nextSibling; @@ -560,10 +560,10 @@ elements.buttonTemplate = elements.buttons.primary.firstChild; //remove button template elements.buttons.primary.removeChild(elements.buttonTemplate); - + for(var x=0; x < instance.__internal.buttons.length; x+=1) { var button = instance.__internal.buttons[x]; - + // add to the list of used keys. if(usedKeys.indexOf(button.key) < 0){ usedKeys.push(button.key); @@ -587,7 +587,7 @@ } //make elements pubic instance.elements = elements; - + //save event handlers delegates internal.resetHandler = delegate(instance, onReset); internal.beginMoveHandler = delegate(instance, beginMove); @@ -599,39 +599,39 @@ internal.transitionInHandler = delegate(instance, handleTransitionInEvent); internal.transitionOutHandler = delegate(instance, handleTransitionOutEvent); - + //settings instance.set('title', setup.options.title === undefined ? alertify.defaults.glossary.title : setup.options.title); - + instance.set('modal', setup.options.modal === undefined ? alertify.defaults.modal : setup.options.modal); instance.set('basic', setup.options.basic === undefined ? alertify.defaults.basic : setup.options.basic); instance.set('frameless', setup.options.frameless === undefined ? alertify.defaults.frameless : setup.options.frameless); - + instance.set('movable', setup.options.movable === undefined ? alertify.defaults.movable : setup.options.movable); instance.set('moveBounded', setup.options.moveBounded === undefined ? alertify.defaults.moveBounded : setup.options.moveBounded); instance.set('resizable', setup.options.resizable === undefined ? alertify.defaults.resizable : setup.options.resizable); instance.set('autoReset', setup.options.autoReset === undefined ? alertify.defaults.autoReset : setup.options.autoReset); - + instance.set('closable', setup.options.closable === undefined ? alertify.defaults.closable : setup.options.closable); instance.set('closableByDimmer', setup.options.closableByDimmer === undefined ? alertify.defaults.closableByDimmer : setup.options.closableByDimmer); instance.set('maximizable', setup.options.maximizable === undefined ? alertify.defaults.maximizable : setup.options.maximizable); instance.set('startMaximized', setup.options.startMaximized === undefined ? alertify.defaults.startMaximized : setup.options.startMaximized); - + instance.set('pinnable', setup.options.pinnable === undefined ? alertify.defaults.pinnable : setup.options.pinnable); instance.set('pinned', setup.options.pinned === undefined ? alertify.defaults.pinned : setup.options.pinned); - + instance.set('transition', setup.options.transition === undefined ? alertify.defaults.transition : setup.options.transition); instance.set('padding', setup.options.padding === undefined ? alertify.defaults.padding : setup.options.padding); instance.set('overflow', setup.options.overflow === undefined ? alertify.defaults.overflow : setup.options.overflow); - + // allow dom customization if(typeof instance.build === 'function'){ instance.build(); } } - + //add to the end of the DOM tree. document.body.appendChild(instance.elements.root); } @@ -669,10 +669,10 @@ addClass(document.body, classes.noOverflow); } } - + /** * Sets the name of the transition used to show/hide the dialog - * + * * @param {Object} instance The dilog instance. * */ @@ -683,7 +683,7 @@ addClass(instance.elements.root, classes.prefix + value); reflow = instance.elements.root.offsetWidth; } - + /** * Toggles the dialog display mode * @@ -696,34 +696,34 @@ //make modal removeClass(instance.elements.root, classes.modeless); - + //only if open if(instance.isOpen()){ unbindModelessEvents(instance); - + //in case a pinned modless dialog was made modal while open. updateAbsPositionFix(instance); - + ensureNoOverflow(); } }else{ //make modelss addClass(instance.elements.root, classes.modeless); - + //only if open if(instance.isOpen()){ bindModelessEvents(instance); - + //in case pin/unpin was called while a modal is open updateAbsPositionFix(instance); - + ensureNoOverflow(); } } } /** - * Toggles the dialog basic view mode + * Toggles the dialog basic view mode * * @param {Object} instance The dilog instance. * @@ -740,7 +740,7 @@ } /** - * Toggles the dialog frameless view mode + * Toggles the dialog frameless view mode * * @param {Object} instance The dilog instance. * @@ -755,7 +755,7 @@ removeClass(instance.elements.root, classes.frameless); } } - + /** * Helper: Brings the modeless dialog to front, attached to modeless dialogs. * @@ -765,7 +765,7 @@ * @return {undefined} */ function bringToFront(event, instance){ - + // Do not bring to front if preceeded by an open modal var index = openDialogs.indexOf(instance); for(var x=index+1;x -1; x -= 1) { if (openDialogs[x].isModal()) { @@ -1419,7 +1419,7 @@ } } /** - * Transition in transitionend event handler. + * Transition in transitionend event handler. * * @param {Event} TransitionEnd event object. * @param {Object} The dilog instance. @@ -1449,7 +1449,7 @@ } /** - * Transition out transitionend event handler. + * Transition out transitionend event handler. * * @param {Event} TransitionEnd event object. * @param {Object} The dilog instance. @@ -1477,7 +1477,7 @@ instance.__internal.activeElement.focus(); instance.__internal.activeElement = null; } - + //destory the instance if (typeof instance.__internal.destroy === 'function') { instance.__internal.destroy.apply(instance); @@ -1502,7 +1502,7 @@ * * @param {Event} event DOM event object. * @param {Node} element The element being moved. - * + * * @return {undefined} */ function moveElement(event, element) { @@ -1512,17 +1512,17 @@ if(refreshTop){ top -= document.body.scrollTop; } - + element.style.left = left + 'px'; element.style.top = top + 'px'; - + } /** * Helper: sets the element top/left coordinates within screen bounds * * @param {Event} event DOM event object. * @param {Node} element The element being moved. - * + * * @return {undefined} */ function moveElementBounded(event, element) { @@ -1532,7 +1532,7 @@ if(refreshTop){ top -= document.body.scrollTop; } - + element.style.left = Math.min(bounds.maxLeft, Math.max(bounds.minLeft, left)) + 'px'; if(refreshTop){ element.style.top = Math.min(bounds.maxTop, Math.max(bounds.minTop, top)) + 'px'; @@ -1540,7 +1540,7 @@ element.style.top = Math.max(bounds.minTop, top) + 'px'; } } - + /** * Triggers the start of a move event, attached to the header element mouse down event. @@ -1548,7 +1548,7 @@ * * @param {Event} event DOM event object. * @param {Object} instance The dilog instance. - * + * * @return {Boolean} false */ function beginMove(event, instance) { @@ -1575,7 +1575,7 @@ if (element.style.top) { top = parseInt(element.style.top, 10); } - + offsetX = eventSrc[xProp] - left; offsetY = eventSrc[yProp] - top; @@ -1584,18 +1584,18 @@ }else if(instance.isPinned()){ offsetY -= document.body.scrollTop; } - + if(instance.get('moveBounded')){ var current = element, offsetLeft = -left, offsetTop = -top; - + //calc offset do { offsetLeft += current.offsetLeft; offsetTop += current.offsetTop; } while (current = current.offsetParent); - + bounds = { maxLeft : offsetLeft, minLeft : -offsetLeft, @@ -1607,7 +1607,7 @@ bounds = null; moveDelegate = moveElement; } - + // allow custom `onmove` method dispatchEvent('onmove', instance); @@ -1624,7 +1624,7 @@ * The actual move handler, attached to document.body mousemove event. * * @param {Event} event DOM event object. - * + * * @return {undefined} */ function move(event) { @@ -1700,7 +1700,7 @@ } /* Controls moving a dialog around */ - //holde the current instance being resized + //holde the current instance being resized var resizable = null, //holds the staring left offset when resize starts. startingLeft = Number.Nan, @@ -1718,7 +1718,7 @@ * @param {Event} event DOM mousemove event object. * @param {Node} element The element being moved. * @param {Boolean} pinned A flag indicating if the element being resized is pinned to the screen. - * + * * @return {undefined} */ function resizeElement(event, element, pageRelative) { @@ -1744,7 +1744,7 @@ // rtl handling var isRTL = isRightToLeft(); if (isRTL) { - // reverse X + // reverse X X = document.body.offsetWidth - X; // if has a starting left, calculate offsetRight if (!isNaN(startingLeft)) { @@ -1782,7 +1782,7 @@ * * @param {Event} event DOM event object. * @param {Object} instance The dilog instance. - * + * * @return {Boolean} false */ function beginResize(event, instance) { @@ -1797,7 +1797,7 @@ if (eventSrc) { // allow custom `onresize` method dispatchEvent('onresize', instance); - + resizable = instance; handleOffset = instance.elements.resizeHandle.offsetHeight / 2; var element = instance.elements.dialog; @@ -1821,7 +1821,7 @@ * The actual resize handler, attached to document.body mousemove event. * * @param {Event} event DOM event object. - * + * * @return {undefined} */ function resize(event) { @@ -2178,12 +2178,12 @@ if(!isNaN(x) && !isNaN(y)){ // allow custom `onmove` method dispatchEvent('onmove', this); - + var element = this.elements.dialog, current = element, offsetLeft = 0, offsetTop = 0; - + //subtract existing left,top if (element.style.left) { offsetLeft -= parseInt(element.style.left, 10); @@ -2208,7 +2208,7 @@ element.style.left = left + 'px'; element.style.top = top + 'px'; - + // allow custom `onmoved` method dispatchEvent('onmoved', this); } @@ -2233,10 +2233,10 @@ ; if(!isNaN(w) && !isNaN(h) && this.get('resizable') === true){ - + // allow custom `onresize` method dispatchEvent('onresize', this); - + if(('' + width).match(regex)){ w = w / 100 * document.documentElement.clientWidth ; } @@ -2253,14 +2253,14 @@ element.style.minHeight = this.elements.header.offsetHeight + this.elements.footer.offsetHeight + 'px'; element.style.width = w + 'px'; element.style.height = h + 'px'; - + // allow custom `onresized` method dispatchEvent('onresized', this); } return this; }, /** - * Gets or Sets dialog settings/options + * Gets or Sets dialog settings/options * * @param {String|Object} key A string specifying a propery name or a collection of key/value pairs. * @param {Object} value Optional, the value associated with the key (in case it was a string). @@ -2292,14 +2292,14 @@ } }, /** - * [Alias] Sets dialog settings/options + * [Alias] Sets dialog settings/options */ set:function(key, value){ this.setting(key,value); return this; }, /** - * [Alias] Gets dialog settings/options + * [Alias] Gets dialog settings/options */ get:function(key){ return this.setting(key); @@ -2350,7 +2350,7 @@ * @return {Object} the dialog instance. */ show: function (modal, className) { - + // ensure initialization initialize(this); @@ -2412,7 +2412,7 @@ //reflow reflow = this.elements.root.offsetWidth; - + // show dialog removeClass(this.elements.root, classes.hidden); @@ -2472,7 +2472,7 @@ // allow custom `onclose` method dispatchEvent('onclose', this); - //remove from open dialogs + //remove from open dialogs openDialogs.splice(openDialogs.indexOf(this),1); this.__internal.isOpen = false; @@ -2526,7 +2526,7 @@ }; /** * Helper: initializes the notifier instance - * + * */ function initialize(instance) { @@ -2546,7 +2546,7 @@ document.body.appendChild(element); } } - + function pushInstance(instance) { instance.__internal.pushed = true; openInstances.push(instance); @@ -2557,7 +2557,7 @@ } /** * Helper: update the notifier instance position - * + * */ function updatePosition(instance) { element.className = classes.base; @@ -2624,10 +2624,10 @@ /* notification DOM element*/ element: div, /* - * Pushes a notification message + * Pushes a notification message * @param {string or DOMElement} content The notification message content * @param {Number} wait The time (in seconds) to wait before the message is dismissed, a value of 0 means keep open till clicked. - * + * */ push: function (_content, _wait) { if (!this.__internal.pushed) { @@ -2674,18 +2674,18 @@ /* * {Function} callback function to be invoked before dismissing the notification message. * Remarks: A return value === 'false' will cancel the dismissal - * + * */ ondismiss: function () { }, /* * {Function} callback function to be invoked when the message is dismissed. - * + * */ callback: callback, /* - * Dismisses the notification message + * Dismisses the notification message * @param {Boolean} clicked A flag indicating if the dismissal was caused by a click. - * + * */ dismiss: function (clicked) { if (this.__internal.pushed) { @@ -2712,7 +2712,7 @@ /* * Delays the notification message dismissal * @param {Number} wait The time (in seconds) to wait before the message is dismissed, a value of 0 means keep open till clicked. - * + * */ delay: function (wait) { clearTimers(this); @@ -2726,7 +2726,7 @@ /* * Sets the notification message contents * @param {string or DOMElement} content The notification message content - * + * */ setContent: function (content) { if (typeof content === 'string') { @@ -2740,7 +2740,7 @@ }, /* * Dismisses all open notifications except this. - * + * */ dismissOthers: function () { notifier.dismissAll(this); @@ -2752,7 +2752,7 @@ //notifier api return { /** - * Gets or Sets notifier settings. + * Gets or Sets notifier settings. * * @param {string} key The setting name * @param {Variant} value The setting value. @@ -2781,14 +2781,14 @@ return this; }, /** - * [Alias] Sets dialog settings/options + * [Alias] Sets dialog settings/options */ set:function(key,value){ this.setting(key,value); return this; }, /** - * [Alias] Gets dialog settings/options + * [Alias] Gets dialog settings/options */ get:function(key){ return this.setting(key); @@ -2907,12 +2907,12 @@ return { /** * Alertify defaults - * + * * @type {Object} */ defaults: defaults, /** - * Dialogs factory + * Dialogs factory * * @param {string} Dialog name. * @param {Function} A Dialog factory function. @@ -3005,13 +3005,13 @@ } }, /** - * [Alias] Sets dialog settings/options + * [Alias] Sets dialog settings/options */ set: function(name,key,value){ return this.setting(name, key,value); }, /** - * [Alias] Gets dialog settings/options + * [Alias] Gets dialog settings/options */ get: function(name, key){ return this.setting(name, key); @@ -3538,6 +3538,9 @@ closeEvent.cancel = !returnValue; } } + if(!closeEvent.cancel){ + input.value = this.settings.value; + } break; } } diff --git a/web/pgadmin/static/js/alertifyjs/alertify.min.js b/web/pgadmin/static/js/alertifyjs/alertify.min.js index aac0e3eb5..f5da0da7f 100644 --- a/web/pgadmin/static/js/alertifyjs/alertify.min.js +++ b/web/pgadmin/static/js/alertifyjs/alertify.min.js @@ -1,3 +1,3 @@ -/*! alertifyjs - v1.7.0 - Mohammad Younes (http://alertifyjs.com) */ +/*! alertifyjs - v1.7.1 - Mohammad Younes (http://alertifyjs.com) */ !function(a){"use strict";function b(a,b){a.className+=" "+b}function c(a,b){for(var c=a.className.split(" "),d=b.split(" "),e=0;e-1&&c.splice(f,1)}a.className=c.join(" ")}function d(){return"rtl"===a.getComputedStyle(document.body).direction}function e(){return document.documentElement&&document.documentElement.scrollTop||document.body.scrollTop}function f(){return document.documentElement&&document.documentElement.scrollLeft||document.body.scrollLeft}function g(a){for(;a.lastChild;)a.removeChild(a.lastChild)}function h(a){if(null===a)return a;var b;if(Array.isArray(a)){b=[];for(var c=0;c0){for(var c=[],d=0;d0&&document.body.className.indexOf(Ba.noOverflow)<0&&b(document.body,Ba.noOverflow)}function w(a,d,e){"string"==typeof e&&c(a.elements.root,Ba.prefix+e),b(a.elements.root,Ba.prefix+d),ya=a.elements.root.offsetWidth}function x(a){a.get("modal")?(c(a.elements.root,Ba.modeless),a.isOpen()&&(oa(a),M(a),u())):(b(a.elements.root,Ba.modeless),a.isOpen()&&(na(a),M(a),u()))}function y(a){a.get("basic")?b(a.elements.root,Ba.basic):c(a.elements.root,Ba.basic)}function z(a){a.get("frameless")?b(a.elements.root,Ba.frameless):c(a.elements.root,Ba.frameless)}function A(a,b){for(var c=p.indexOf(b),d=c+1;d-1?(R(b,function(a){return a.key===c}),!1):void 0}function U(a){var b=p[p.length-1],c=a.keyCode;if(c===n.LEFT||c===n.RIGHT){for(var d=b.__internal.buttons,e=0;en.F1-1&&xa.indexOf(c)>-1)return a.preventDefault(),a.stopPropagation(),R(b,function(a){return a.key===c}),!1}function V(a,b){if(b)b.focus();else{var c=a.__internal.focus,d=c.element;switch(typeof c.element){case"number":a.__internal.buttons.length>c.element&&(d=a.get("basic")===!0?a.elements.reset[0]:a.__internal.buttons[c.element].element);break;case"string":d=a.elements.body.querySelector(c.element);break;case"function":d=c.element.call(a)}"undefined"!=typeof d&&null!==d||0!==a.__internal.buttons.length||(d=a.elements.reset[0]),d&&d.focus&&(d.focus(),c.select&&d.select&&d.select())}}function W(a,b){if(!b)for(var c=p.length-1;c>-1;c-=1)if(p[c].isModal()){b=p[c];break}if(b&&b.isModal()){var d,e=a.srcElement||a.target,f=e===b.elements.reset[1]||0===b.__internal.buttons.length&&e===document.body;f&&(b.get("maximizable")?d=b.elements.commands.maximize:b.get("closable")&&(d=b.elements.commands.close)),void 0===d&&("number"==typeof b.__internal.focus.element?e===b.elements.reset[0]?d=b.elements.buttons.auxiliary.firstChild||b.elements.buttons.primary.firstChild:f&&(d=b.elements.reset[0]):e===b.elements.reset[0]&&(d=b.elements.buttons.primary.lastChild||b.elements.buttons.auxiliary.lastChild)),V(b,d)}}function X(a,b){clearTimeout(b.__internal.timerIn),V(b),t(),Da=!1,l("onfocus",b),r(b.elements.dialog,s.type,b.__internal.transitionInHandler),c(b.elements.root,Ba.animationIn)}function Y(a,b){clearTimeout(b.__internal.timerOut),r(b.elements.dialog,s.type,b.__internal.transitionOutHandler),ca(b),ia(b),b.isMaximized()&&!b.get("startMaximized")&&I(b),v.defaults.maintainFocus&&b.__internal.activeElement&&(b.__internal.activeElement.focus(),b.__internal.activeElement=null),"function"==typeof b.__internal.destroy&&b.__internal.destroy.apply(b)}function Z(a,b){var c=a[Ha]-Fa,d=a[Ia]-Ga;Ka&&(d-=document.body.scrollTop),b.style.left=c+"px",b.style.top=d+"px"}function $(a,b){var c=a[Ha]-Fa,d=a[Ia]-Ga;Ka&&(d-=document.body.scrollTop),b.style.left=Math.min(Ja.maxLeft,Math.max(Ja.minLeft,c))+"px",Ka?b.style.top=Math.min(Ja.maxTop,Math.max(Ja.minTop,d))+"px":b.style.top=Math.max(Ja.minTop,d)+"px"}function _(a,c){if(null===Ma&&!c.isMaximized()&&c.get("movable")){var d,e=0,f=0;if("touchstart"===a.type?(a.preventDefault(),d=a.targetTouches[0],Ha="clientX",Ia="clientY"):0===a.button&&(d=a),d){var g=c.elements.dialog;if(b(g,Ba.capture),g.style.left&&(e=parseInt(g.style.left,10)),g.style.top&&(f=parseInt(g.style.top,10)),Fa=d[Ha]-e,Ga=d[Ia]-f,c.isModal()?Ga+=c.elements.modal.scrollTop:c.isPinned()&&(Ga-=document.body.scrollTop),c.get("moveBounded")){var h=g,i=-e,j=-f;do i+=h.offsetLeft,j+=h.offsetTop;while(h=h.offsetParent);Ja={maxLeft:i,minLeft:-i,maxTop:document.documentElement.clientHeight-g.clientHeight-j,minTop:-j},La=$}else Ja=null,La=Z;return l("onmove",c),Ka=!c.isModal()&&c.isPinned(),Ea=c,La(d,g),b(document.body,Ba.noSelection),!1}}}function aa(a){if(Ea){var b;"touchmove"===a.type?(a.preventDefault(),b=a.targetTouches[0]):0===a.button&&(b=a),b&&La(b,Ea.elements.dialog)}}function ba(){if(Ea){var a=Ea;Ea=Ja=null,c(document.body,Ba.noSelection),c(a.elements.dialog,Ba.capture),l("onmoved",a)}}function ca(a){Ea=null;var b=a.elements.dialog;b.style.left=b.style.top=""}function da(a){a.get("movable")?(b(a.elements.root,Ba.movable),a.isOpen()&&pa(a)):(ca(a),c(a.elements.root,Ba.movable),a.isOpen()&&qa(a))}function ea(a,b,c){var e=b,f=0,g=0;do f+=e.offsetLeft,g+=e.offsetTop;while(e=e.offsetParent);var h,i;c===!0?(h=a.pageX,i=a.pageY):(h=a.clientX,i=a.clientY);var j=d();if(j&&(h=document.body.offsetWidth-h,isNaN(Na)||(f=document.body.offsetWidth-f-b.offsetWidth)),b.style.height=i-g+Qa+"px",b.style.width=h-f+Qa+"px",!isNaN(Na)){var k=.5*Math.abs(b.offsetWidth-Oa);j&&(k*=-1),b.offsetWidth>Oa?b.style.left=Na+k+"px":b.offsetWidth>=Pa&&(b.style.left=Na-k+"px")}}function fa(a,c){if(!c.isMaximized()){var d;if("touchstart"===a.type?(a.preventDefault(),d=a.targetTouches[0]):0===a.button&&(d=a),d){l("onresize",c),Ma=c,Qa=c.elements.resizeHandle.offsetHeight/2;var e=c.elements.dialog;return b(e,Ba.capture),Na=parseInt(e.style.left,10),e.style.height=e.offsetHeight+"px",e.style.minHeight=c.elements.header.offsetHeight+c.elements.footer.offsetHeight+"px",e.style.width=(Oa=e.offsetWidth)+"px","none"!==e.style.maxWidth&&(e.style.minWidth=(Pa=e.offsetWidth)+"px"),e.style.maxWidth="none",b(document.body,Ba.noSelection),!1}}}function ga(a){if(Ma){var b;"touchmove"===a.type?(a.preventDefault(),b=a.targetTouches[0]):0===a.button&&(b=a),b&&ea(b,Ma.elements.dialog,!Ma.get("modal")&&!Ma.get("pinned"))}}function ha(){if(Ma){var a=Ma;Ma=null,c(document.body,Ba.noSelection),c(a.elements.dialog,Ba.capture),Ca=!0,l("onresized",a)}}function ia(a){Ma=null;var b=a.elements.dialog;"none"===b.style.maxWidth&&(b.style.maxWidth=b.style.minWidth=b.style.width=b.style.height=b.style.minHeight=b.style.left="",Na=Number.Nan,Oa=Pa=Qa=0)}function ja(a){a.get("resizable")?(b(a.elements.root,Ba.resizable),a.isOpen()&&ra(a)):(ia(a),c(a.elements.root,Ba.resizable),a.isOpen()&&sa(a))}function ka(){for(var a=0;a-1&&a.navigator.userAgent.indexOf("Chrome")<0,Aa={dimmer:'
',modal:'
',dialog:'
',reset:'',commands:'
',header:'
',body:'
',content:'
',footer:'
',buttons:{primary:'
',auxiliary:'
'},button:'',resizeHandle:'
'},Ba={base:"alertify",prefix:"ajs-",hidden:"ajs-hidden",noSelection:"ajs-no-selection",noOverflow:"ajs-no-overflow",noPadding:"ajs-no-padding",modeless:"ajs-modeless",movable:"ajs-movable",resizable:"ajs-resizable",capture:"ajs-capture",fixed:"ajs-fixed",closable:"ajs-closable",maximizable:"ajs-maximizable",maximize:"ajs-maximize",restore:"ajs-restore",pinnable:"ajs-pinnable",unpinned:"ajs-unpinned",pin:"ajs-pin",maximized:"ajs-maximized",animationIn:"ajs-in",animationOut:"ajs-out",shake:"ajs-shake",basic:"ajs-basic",frameless:"ajs-frameless"},Ca=!1,Da=!1,Ea=null,Fa=0,Ga=0,Ha="pageX",Ia="pageY",Ja=null,Ka=!1,La=null,Ma=null,Na=Number.Nan,Oa=0,Pa=0,Qa=0;return{__init:m,isOpen:function(){return this.__internal.isOpen},isModal:function(){return this.elements.root.className.indexOf(Ba.modeless)<0},isMaximized:function(){return this.elements.root.className.indexOf(Ba.maximized)>-1},isPinned:function(){return this.elements.root.className.indexOf(Ba.unpinned)<0},maximize:function(){return this.isMaximized()||H(this),this},restore:function(){return this.isMaximized()&&I(this),this},pin:function(){return this.isPinned()||F(this),this},unpin:function(){return this.isPinned()&&G(this),this},bringToFront:function(){return A(null,this),this},moveTo:function(a,b){if(!isNaN(a)&&!isNaN(b)){l("onmove",this);var c=this.elements.dialog,e=c,f=0,g=0;c.style.left&&(f-=parseInt(c.style.left,10)),c.style.top&&(g-=parseInt(c.style.top,10));do f+=e.offsetLeft,g+=e.offsetTop;while(e=e.offsetParent);var h=a-f,i=b-g;d()&&(h*=-1),c.style.left=h+"px",c.style.top=i+"px",l("onmoved",this)}return this},resizeTo:function(a,b){var c=parseFloat(a),d=parseFloat(b),e=/(\d*\.\d+|\d+)%/;if(!isNaN(c)&&!isNaN(d)&&this.get("resizable")===!0){l("onresize",this),(""+a).match(e)&&(c=c/100*document.documentElement.clientWidth),(""+b).match(e)&&(d=d/100*document.documentElement.clientHeight);var f=this.elements.dialog;"none"!==f.style.maxWidth&&(f.style.minWidth=(Pa=f.offsetWidth)+"px"),f.style.maxWidth="none",f.style.minHeight=this.elements.header.offsetHeight+this.elements.footer.offsetHeight+"px",f.style.width=c+"px",f.style.height=d+"px",l("onresized",this)}return this},setting:function(a,b){var c=this,d=C(this,this.__internal.options,function(a,b,d){B(c,a,b,d)},a,b);if("get"===d.op)return d.found?d.value:"undefined"!=typeof this.settings?C(this,this.settings,this.settingUpdated||function(){},a,b).value:void 0;if("set"===d.op){if(d.items.length>0)for(var e=this.settingUpdated||function(){},f=0;f0){var b=this;this.__internal.timer=setTimeout(function(){b.dismiss()},1e3*this.__internal.delay)}return this},setContent:function(b){return"string"==typeof b?(g(this.element),this.element.innerHTML=b):b instanceof a.HTMLElement&&this.element.firstChild!==b&&(g(this.element),this.element.appendChild(b)),this},dismissOthers:function(){return u.dismissAll(this),this}})}var k,l,m=[],n={base:"alertify-notifier",message:"ajs-message",top:"ajs-top",right:"ajs-right",bottom:"ajs-bottom",left:"ajs-left",visible:"ajs-visible",hidden:"ajs-hidden"};return{setting:function(a,b){if(d(this),"undefined"==typeof b)return this.__internal[a];switch(a){case"position":this.__internal.position=b,h(this);break;case"delay":this.__internal.delay=b}return this},set:function(a,b){return this.setting(a,b),this},get:function(a){return this.setting(a)},create:function(a,b){d(this);var c=document.createElement("div");return c.className=n.message+("string"==typeof a&&""!==a?" ajs-"+a:""),i(c,b)},dismissAll:function(a){for(var b=m.slice(0),c=0;c