@atlassian/aui 9.3.21 → 9.3.23

package/src/js/aui/dialog.js

@@ -23,8 +23,8 @@ const ZINDEX_DIALOG_1 = 2600; // see also dialog.less
  * </pre>
  * @param options {object} [optional] Permitted options and defaults are as follows:
  * width (800), height (600), keypressListener (closes dialog on ESC).
-*/
-function createPopup (options) {
+ */
+function createPopup(options) {
     var defaults = {
         width: 800,
         height: 600,
@@ -33,14 +33,14 @@ function createPopup (options) {
             if (e.keyCode === keyCode.ESCAPE && popup.is(':visible')) {
                 res.hide();
             }
-        }
+        },
     };
     // for backwards-compatibility
     if (typeof options !== 'object') {
         options = {
             width: arguments[0],
             height: arguments[1],
-            id: arguments[2]
+            id: arguments[2],
         };
         options = $.extend({}, options, arguments[3]);
     }
@@ -54,22 +54,25 @@ function createPopup (options) {
     var highestZIndex = ZINDEX_DIALOG_1;
     $('.aui-dialog').each(function () {
         var currentPopup = $(this);
-        highestZIndex = (currentPopup.css('z-index') > highestZIndex) ? currentPopup.css('z-index') : highestZIndex;
+        highestZIndex =
+            currentPopup.css('z-index') > highestZIndex
+                ? currentPopup.css('z-index')
+                : highestZIndex;
     });
 
-    var applySize = (function _applySize (width, height) {
-        options.width = (width = (width || options.width));
-        options.height = (height = (height || options.height));
+    var applySize = (function _applySize(width, height) {
+        options.width = width = width || options.width;
+        options.height = height = height || options.height;
 
         popup.css({
-            marginTop: -Math.round(height / 2) + 'px',
-            marginLeft: -Math.round(width / 2) + 'px',
-            width: width,
-            height: height,
-            'z-index': parseInt(highestZIndex,10) + 2  //+ 2 so that the shadow can be shown on +1 (underneath the popup but above everything else)
+            'marginTop': -Math.round(height / 2) + 'px',
+            'marginLeft': -Math.round(width / 2) + 'px',
+            'width': width,
+            'height': height,
+            'z-index': parseInt(highestZIndex, 10) + 2, //+ 2 so that the shadow can be shown on +1 (underneath the popup but above everything else)
         });
         return _applySize;
-    }(options.width, options.height));
+    })(options.width, options.height);
 
     $('body').append(popup);
 
@@ -80,7 +83,7 @@ function createPopup (options) {
      * Popup object
      * @class Popup
      * @static
-    */
+     */
 
     //blanket for reference further down
     var blanket = $('.aui-blanket');
@@ -102,14 +105,17 @@ function createPopup (options) {
             return focusItem(options.focusSelector, element);
         }
         var defaultFocusSelector = ':input:visible:enabled:first';
-        if (focusItem(defaultFocusSelector, $('.dialog-page-body', element))) { return; }
-        if (focusItem(defaultFocusSelector, $('.dialog-button-panel', element))) { return; }
+        if (focusItem(defaultFocusSelector, $('.dialog-page-body', element))) {
+            return;
+        }
+        if (focusItem(defaultFocusSelector, $('.dialog-button-panel', element))) {
+            return;
+        }
 
         focusItem(defaultFocusSelector, $('.dialog-page-menu', element));
     };
 
     var res = {
-
         changeSize: function (w, h) {
             if ((w && w != options.width) || (h && h != options.height)) {
                 applySize(w, h);
@@ -120,18 +126,17 @@ function createPopup (options) {
         /**
          * Shows the popup
          * @method show
-        */
+         */
         show: function () {
-
             var show = function () {
                 $(document)
                     .off('keydown', options.keypressListener)
                     .on('keydown', options.keypressListener);
                 dim();
                 blanket = $('.aui-blanket');
-                if (blanket.length !== 0 && options.closeOnOutsideClick){
+                if (blanket.length !== 0 && options.closeOnOutsideClick) {
                     blanket.on('click', function () {
-                        if (popup.is(':visible')){
+                        if (popup.is(':visible')) {
                             res.hide();
                         }
                     });
@@ -148,7 +153,7 @@ function createPopup (options) {
         /**
          * Hides the popup.
          * @method hide
-        */
+         */
         hide: function () {
             $(document).unbind('keydown', options.keypressListener);
             blanket.unbind();
@@ -172,12 +177,12 @@ function createPopup (options) {
         /**
          * jQuery object, representing popup DOM element
          * @property element
-        */
+         */
         element: popup,
         /**
          * Removes popup elements from the DOM
          * @method remove
-        */
+         */
         remove: function () {
             popup.remove();
             this.element = null;
@@ -185,12 +190,12 @@ function createPopup (options) {
         /**
          * disables the popup
          * @method disable
-        */
+         */
         disable: function () {
-            if (!this.disabled){
+            if (!this.disabled) {
                 this.popupBlanket = $("<div class='dialog-blanket'> </div>").css({
                     height: popup.height(),
-                    width: popup.width()
+                    width: popup.width(),
                 });
                 popup.append(this.popupBlanket);
                 this.disabled = true;
@@ -199,14 +204,14 @@ function createPopup (options) {
         /**
          * enables the popup if it is disabled
          * @method enable
-        */
+         */
         enable: function () {
             if (this.disabled) {
                 this.disabled = false;
                 this.popupBlanket.remove();
                 this.popupBlanket = null;
             }
-        }
+        },
     };
 
     return res;
@@ -222,7 +227,7 @@ var Dialog = (function () {
      * @param onclick {function} [optional] click event handler
      * @param className {string} [optional] class name
      * @private
-    */
+     */
     function Button(page, label, onclick, className) {
         if (!page.buttonpanel) {
             page.addButtonPanel();
@@ -252,14 +257,14 @@ var Dialog = (function () {
      * @param onclick {function} [optional] click event handler
      * @param className {string} [optional] class name
      * @private
-    */
+     */
     function Link(page, label, onclick, className, url) {
         if (!page.buttonpanel) {
             page.addButtonPanel();
         }
 
         //if no url is given use # as default
-        if (!url){
+        if (!url) {
             url = '#';
         }
 
@@ -280,13 +285,13 @@ var Dialog = (function () {
         page.button[this.id] = this;
     }
 
-    function itemMove (leftOrRight, target) {
+    function itemMove(leftOrRight, target) {
         var dir = leftOrRight == 'left' ? -1 : 1;
         return function (step) {
             var dtarget = this.page[target];
-            if (this.id != ((dir == 1) ? dtarget.length - 1 : 0)) {
-                dir *= (step || 1);
-                dtarget[this.id + dir].item[(dir < 0 ? 'before' : 'after')](this.item);
+            if (this.id != (dir == 1 ? dtarget.length - 1 : 0)) {
+                dir *= step || 1;
+                dtarget[this.id + dir].item[dir < 0 ? 'before' : 'after'](this.item);
                 dtarget.splice(this.id, 1);
                 dtarget.splice(this.id + dir, 0, this);
                 for (var i = 0, ii = dtarget.length; i < ii; i++) {
@@ -314,7 +319,7 @@ var Dialog = (function () {
      * @method moveLeft
      * @param step {number} how many items to move, default is 1
      * @return {object} button
-    */
+     */
     Button.prototype.moveUp = Button.prototype.moveLeft = itemMove('left', 'button');
     /**
      * Moves item right in the hierarchy
@@ -322,12 +327,12 @@ var Dialog = (function () {
      * @method moveRight
      * @param step {number} how many items to move, default is 1
      * @return {object} button
-    */
+     */
     Button.prototype.moveDown = Button.prototype.moveRight = itemMove('right', 'button');
     /**
      * Removes item
      * @method remove
-    */
+     */
     Button.prototype.remove = itemRemove('button');
 
     /**
@@ -336,7 +341,7 @@ var Dialog = (function () {
      * @param label {string} [optional] label of the button
      * @return {string} label, if nothing is passed in
      * @return {object} jQuery button object, if label is passed in
-    */
+     */
     Button.prototype.html = function (label) {
         return this.item.html(label);
     };
@@ -345,7 +350,7 @@ var Dialog = (function () {
      * @method onclick
      * @param onclick {function} [optional] new event handler, that is going to replace the old one
      * @return {function} existing event handler if new one is undefined
-    */
+     */
     Button.prototype.onclick = function (onclick) {
         let self = this;
         if (typeof onclick === 'undefined') {
@@ -373,7 +378,7 @@ var Dialog = (function () {
      * @param className {string} [optional] HTML class name
      * @param panelButtonId {string} the unique id that will be put on the button element for this panel.
      * @private
-    */
+     */
     var Panel = function (page, title, reference, className, panelButtonId) {
         if (!(reference instanceof $)) {
             reference = $(reference);
@@ -389,7 +394,10 @@ var Dialog = (function () {
         }
 
         this.item = $('<li></li>').append(this.button).addClass('page-menu-item');
-        this.body = $('<div></div>').append(reference).addClass('dialog-panel-body').css('height', page.dialog.height + 'px');
+        this.body = $('<div></div>')
+            .append(reference)
+            .addClass('dialog-panel-body')
+            .css('height', page.dialog.height + 'px');
         this.padding = DEFAULT_PADDING;
         if (className) {
             this.body.addClass(className);
@@ -405,13 +413,13 @@ var Dialog = (function () {
                 cur = page.panel[page.curtab];
                 cur.body.hide();
                 cur.item.removeClass('selected');
-                (typeof cur.onblur === 'function') && cur.onblur();
+                typeof cur.onblur === 'function' && cur.onblur();
             }
             page.curtab = tab.id;
             tab.body.show();
             tab.item.addClass('selected');
-            (typeof tab.onselect === 'function') && tab.onselect();
-            (typeof page.ontabchange === 'function') && page.ontabchange(tab, cur);
+            typeof tab.onselect === 'function' && tab.onselect();
+            typeof page.ontabchange === 'function' && page.ontabchange(tab, cur);
         };
         if (!this.button.click) {
             logger.log('atlassian-dialog:Panel:constructor - this.button.click false');
@@ -429,7 +437,7 @@ var Dialog = (function () {
     /**
      * Selects current panel
      * @method select
-    */
+     */
     Panel.prototype.select = function () {
         this.button.click();
     };
@@ -439,7 +447,7 @@ var Dialog = (function () {
      * @method moveLeft
      * @param step {number} how many items to move, default is 1
      * @return {object} panel
-    */
+     */
     Panel.prototype.moveUp = Panel.prototype.moveLeft = itemMove('left', 'panel');
     /**
      * Moves item right in the hierarchy
@@ -447,12 +455,12 @@ var Dialog = (function () {
      * @method moveRight
      * @param step {number} how many items to move, default is 1
      * @return {object} panel
-    */
+     */
     Panel.prototype.moveDown = Panel.prototype.moveRight = itemMove('right', 'panel');
     /**
      * Removes item
      * @method remove
-    */
+     */
     Panel.prototype.remove = itemRemove('panel');
     /**
      * Getter and setter of inner HTML of the panel
@@ -460,7 +468,7 @@ var Dialog = (function () {
      * @param html {string} HTML source to set up
      * @return {object} panel
      * @return {string} current HTML source
-    */
+     */
     Panel.prototype.html = function (html) {
         if (html) {
             this.body.html(html);
@@ -475,7 +483,7 @@ var Dialog = (function () {
      * @param padding {number} padding in pixels
      * @return {object} panel
      * @see DEFAULT_PADDING
-    */
+     */
     Panel.prototype.setPadding = function (padding) {
         if (!isNaN(+padding)) {
             this.body.css('padding', +padding);
@@ -496,13 +504,15 @@ var Dialog = (function () {
      * @param dialog {object} dialog object
      * @param className {string} [optional] HTML class name
      * @private
-    */
+     */
     var Page = function (dialog, className) {
         this.dialog = dialog;
         this.id = dialog.page.length;
         this.element = $('<div></div>').addClass('dialog-components');
         this.body = $('<div></div>').addClass('dialog-page-body');
-        this.menu = $('<ul></ul>').addClass('dialog-page-menu').css('height', dialog.height + 'px');
+        this.menu = $('<ul></ul>')
+            .addClass('dialog-page-menu')
+            .css('height', dialog.height + 'px');
         this.body.append(this.menu);
         this.curtab;
         this.panel = [];
@@ -517,11 +527,11 @@ var Dialog = (function () {
     /**
      * Size updater for contents of the page. For internal use
      * @method recalcSize
-    */
+     */
     Page.prototype.recalcSize = function () {
         var headerHeight = this.header ? HEADER_HEIGHT : 0;
         var buttonHeight = this.buttonpanel ? BUTTONS_HEIGHT : 0;
-        for (var i = this.panel.length; i--;) {
+        for (var i = this.panel.length; i--; ) {
             var dialogComponentsHeight = this.dialog.height - headerHeight - buttonHeight;
             this.panel[i].body.css('height', dialogComponentsHeight);
             this.menu.css('height', dialogComponentsHeight);
@@ -545,7 +555,7 @@ var Dialog = (function () {
      * @param className {string} [optional] HTML class name
      * @param panelButtonId {string} [optional] The unique id for the panel's button.
      * @return {object} the page
-    */
+     */
     Page.prototype.addPanel = function (title, reference, className, panelButtonId) {
         new Panel(this, title, reference, className, panelButtonId);
         this.recalcSize();
@@ -557,12 +567,14 @@ var Dialog = (function () {
      * @param title {string} panel title
      * @param className {string} [optional] CSS class name
      * @return {object} the page
-    */
+     */
     Page.prototype.addHeader = function (title, className) {
         if (this.header) {
             this.header.remove();
         }
-        this.header =  $('<h2></h2>').text(title || '').addClass('dialog-title');
+        this.header = $('<h2></h2>')
+            .text(title || '')
+            .addClass('dialog-title');
         className && this.header.addClass(className);
         this.element.prepend(this.header);
         this.recalcSize();
@@ -575,7 +587,7 @@ var Dialog = (function () {
      * @param onclick {function} [optional] click event handler
      * @param className {string} [optional] class name
      * @return {object} the page
-    */
+     */
     Page.prototype.addButton = function (label, onclick, className) {
         new Button(this, label, onclick, className);
         this.recalcSize();
@@ -588,7 +600,7 @@ var Dialog = (function () {
      * @param onclick {function} [optional] click event handler
      * @param className {string} [optional] class name
      * @return {object} the page
-    */
+     */
     Page.prototype.addLink = function (label, onclick, className, url) {
         new Link(this, label, onclick, className, url);
         this.recalcSize();
@@ -600,7 +612,7 @@ var Dialog = (function () {
      * @method gotoPanel
      * @param panel {object} panel object
      * @param panel {number} id of the panel
-    */
+     */
     Page.prototype.gotoPanel = function (panel) {
         this.panel[panel.id || panel].select();
     };
@@ -608,34 +620,32 @@ var Dialog = (function () {
      * Returns current panel on the page
      * @method getCurrentPanel
      * @return panel {object} the panel
-    */
+     */
     Page.prototype.getCurrentPanel = function () {
         return this.panel[this.curtab];
     };
     /**
      * Hides the page
      * @method hide
-    */
+     */
     Page.prototype.hide = function () {
         this.element.hide();
     };
     /**
      * Shows the page, if it was hidden
      * @method show
-    */
+     */
     Page.prototype.show = function () {
         this.element.show();
     };
     /**
      * Removes the page
      * @method remove
-    */
+     */
     Page.prototype.remove = function () {
         this.element.remove();
     };
 
-
-
     /**
      * Constructor for a Dialog. A Dialog is a popup which consists of Pages, where each Page can consist of Panels,
      * Buttons and a Header. The dialog must be constructed in page order as it has a current page state. For example,
@@ -663,8 +673,8 @@ var Dialog = (function () {
      * @param width {number} dialog width in pixels, or an object containing the Dialog parameters
      * @param height {number} dialog height in pixels
      * @param id {number} [optional] dialog id
-    */
-    function Dialog (width, height, id) {
+     */
+    function Dialog(width, height, id) {
         var options = {};
         if (!+width) {
             options = Object(width);
@@ -678,7 +688,7 @@ var Dialog = (function () {
         options = $.extend({}, options, {
             width: this.width,
             height: this.height,
-            id: this.id
+            id: this.id,
         });
         this.popup = createPopup(options);
 
@@ -687,8 +697,7 @@ var Dialog = (function () {
         this.curpage = 0;
 
         new Page(this);
-    };
-
+    }
 
     /**
      * Method for adding header to the current page
@@ -696,7 +705,7 @@ var Dialog = (function () {
      * @param title {string} panel title
      * @param className {string} [optional] HTML class name
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.addHeader = function (title, className) {
         this.page[this.curpage].addHeader(title, className);
         return this;
@@ -708,7 +717,7 @@ var Dialog = (function () {
      * @param onclick {function} [optional] click event handler
      * @param className {string} [optional] class name
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.addButton = function (label, onclick, className) {
         this.page[this.curpage].addButton(label, onclick, className);
         return this;
@@ -721,47 +730,45 @@ var Dialog = (function () {
      * @param onclick {function} [optional] click event handler
      * @param className {string} [optional] class name
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.addLink = function (label, onclick, className, url) {
         this.page[this.curpage].addLink(label, onclick, className, url);
         return this;
     };
 
     /**
-    * Method for adding a submit button to the current page
-    * @method addSubmit
-    * @param label {string} link label
-    * @param onclick {function} [optional] click event handler
-    * @return {object} the dialog
-    */
+     * Method for adding a submit button to the current page
+     * @method addSubmit
+     * @param label {string} link label
+     * @param onclick {function} [optional] click event handler
+     * @return {object} the dialog
+     */
     Dialog.prototype.addSubmit = function (label, onclick) {
         this.page[this.curpage].addButton(label, onclick, 'button-panel-submit-button');
         return this;
     };
 
     /**
-    * Method for adding a cancel link to the current page
-    * @method addCancel
-    * @param label {string} link label
-    * @param onclick {function} [optional] click event handler
-    * @return {object} the dialog
-    */
+     * Method for adding a cancel link to the current page
+     * @method addCancel
+     * @param label {string} link label
+     * @param onclick {function} [optional] click event handler
+     * @return {object} the dialog
+     */
     Dialog.prototype.addCancel = function (label, onclick) {
         this.page[this.curpage].addLink(label, onclick, 'button-panel-cancel-link');
         return this;
     };
 
-
     /**
      * Method for adding new button panel to the current page
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.addButtonPanel = function () {
         this.page[this.curpage].addButtonPanel();
         return this;
     };
 
-
     /**
      * Method for adding new panel to the current page.
      * @method addPanel
@@ -770,7 +777,7 @@ var Dialog = (function () {
      * @param className {string} [optional] HTML class name
      * @param panelButtonId {String} [optional] The unique id for the panel's button.
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.addPanel = function (title, reference, className, panelButtonId) {
         this.page[this.curpage].addPanel(title, reference, className, panelButtonId);
         return this;
@@ -780,7 +787,7 @@ var Dialog = (function () {
      * @method addPage
      * @param className {string} [optional] HTML class name
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.addPage = function (className) {
         new Page(this, className);
         this.page[this.curpage].hide();
@@ -791,7 +798,7 @@ var Dialog = (function () {
      * Making next page in hierarchy visible and active
      * @method nextPage
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.nextPage = function () {
         this.page[this.curpage++].hide();
         if (this.curpage >= this.page.length) {
@@ -804,7 +811,7 @@ var Dialog = (function () {
      * Making previous page in hierarchy visible and active
      * @method prevPage
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.prevPage = function () {
         this.page[this.curpage--].hide();
         if (this.curpage < 0) {
@@ -818,7 +825,7 @@ var Dialog = (function () {
      * @method gotoPage
      * @param num {number} page id
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.gotoPage = function (num) {
         this.page[this.curpage].hide();
         this.curpage = num;
@@ -836,9 +843,9 @@ var Dialog = (function () {
      * @param pageorpanelId {number} page id or panel id
      * @param panelId {number} panel id
      * @return {object} the internal Panel object
-    */
+     */
     Dialog.prototype.getPanel = function (pageorpanelId, panelId) {
-        var pageid = (panelId == null) ? this.curpage : pageorpanelId;
+        var pageid = panelId == null ? this.curpage : pageorpanelId;
         if (panelId == null) {
             panelId = pageorpanelId;
         }
@@ -849,7 +856,7 @@ var Dialog = (function () {
      * @method getPage
      * @param pageid {number} page id
      * @return {object} the internal Page Object
-    */
+     */
     Dialog.prototype.getPage = function (pageid) {
         return this.page[pageid];
     };
@@ -857,7 +864,7 @@ var Dialog = (function () {
      * Returns current panel at the current page
      * @method getCurrentPanel
      * @return {object} the internal Panel object
-    */
+     */
     Dialog.prototype.getCurrentPanel = function () {
         return this.page[this.curpage].getCurrentPanel();
     };
@@ -868,7 +875,7 @@ var Dialog = (function () {
      * @param pageorpanel {object} panel object or page object
      * @param panel {object} panel object
      * @param panel {number} id of the panel
-    */
+     */
     Dialog.prototype.gotoPanel = function (pageorpanel, panel) {
         if (panel != null) {
             var pageid = pageorpanel.id || pageorpanel;
@@ -881,35 +888,35 @@ var Dialog = (function () {
      * Shows the dialog, if it is not visible
      * @method show
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.show = function () {
         this.popup.show();
-        trigger('show.dialog', {dialog: this});
+        trigger('show.dialog', { dialog: this });
         return this;
     };
     /**
      * Hides the dialog, if it was visible
      * @method hide
      * @return {object} the dialog
-    */
+     */
     Dialog.prototype.hide = function () {
         this.popup.hide();
-        trigger('hide.dialog', {dialog: this});
+        trigger('hide.dialog', { dialog: this });
         return this;
     };
     /**
      * Removes the dialog elements from the DOM
      * @method remove
-    */
+     */
     Dialog.prototype.remove = function () {
         this.popup.hide();
         this.popup.remove();
-        trigger('remove.dialog', {dialog: this});
+        trigger('remove.dialog', { dialog: this });
     };
     /**
      * Disables the dialog if enabled
      * @method disable
-    */
+     */
     Dialog.prototype.disable = function () {
         this.popup.disable();
         return this;
@@ -917,7 +924,7 @@ var Dialog = (function () {
     /**
      * Enables the dialog if disabled
      * @method disable
-    */
+     */
     Dialog.prototype.enable = function () {
         this.popup.enable();
         return this;
@@ -935,77 +942,102 @@ var Dialog = (function () {
     Dialog.prototype.get = function (query) {
         var coll = [];
         var dialog = this;
-        var nameExp = '#([^"][^ ]*|"[^"]*")';     // a name is a hash followed by either a bare word or quoted string
-        var indexExp = ':(\\d+)';                 // an index is a colon followed by some digits
+        var nameExp = '#([^"][^ ]*|"[^"]*")'; // a name is a hash followed by either a bare word or quoted string
+        var indexExp = ':(\\d+)'; // an index is a colon followed by some digits
         var typeExp = 'page|panel|button|header'; // one of the allowed types
-        var selectorExp = '(?:' +                 // a selector is either ...
-            '(' + typeExp + ')(?:' + nameExp + '|' + indexExp + ')?' + // a type optionally followed by either #name or :index
-            '|' + nameExp +                       // or just a #name
+        var selectorExp =
+            '(?:' + // a selector is either ...
+            '(' +
+            typeExp +
+            ')(?:' +
+            nameExp +
+            '|' +
+            indexExp +
+            ')?' + // a type optionally followed by either #name or :index
+            '|' +
+            nameExp + // or just a #name
             ')';
-        var queryRE = new RegExp('(?:^|,)' +      // a comma or at the start of the line
-            '\\s*' + selectorExp +                // optional space and a selector
-            '(?:\\s+' + selectorExp + ')?' +      // optionally, followed by some space and a second selector
-            '\\s*(?=,|$)', 'ig');                 // followed by, but not including, a comma or the end of the string
-        (query + '').replace(queryRE, function (all, name, title, id, justtitle, name2, title2, id2, justtitle2) {
-            name = name && name.toLowerCase();
-            var pages = [];
-            if (name == 'page' && dialog.page[id]) {
-                pages.push(dialog.page[id]);
-                name = name2;
+        var queryRE = new RegExp(
+            '(?:^|,)' + // a comma or at the start of the line
+                '\\s*' +
+                selectorExp + // optional space and a selector
+                '(?:\\s+' +
+                selectorExp +
+                ')?' + // optionally, followed by some space and a second selector
+                '\\s*(?=,|$)',
+            'ig'
+        ); // followed by, but not including, a comma or the end of the string
+        (query + '').replace(
+            queryRE,
+            function (all, name, title, id, justtitle, name2, title2, id2, justtitle2) {
                 name = name && name.toLowerCase();
-                title = title2;
-                id = id2;
-                justtitle = justtitle2;
-            } else {
-                pages = dialog.page;
-            }
-            title = title && (title + '').replace(/"/g, '');
-            title2 = title2 && (title2 + '').replace(/"/g, '');
-            justtitle = justtitle && (justtitle + '').replace(/"/g, '');
-            justtitle2 = justtitle2 && (justtitle2 + '').replace(/"/g, '');
-            if (name || justtitle) {
-                for (var i = pages.length; i--;) {
-                    if (justtitle || (name == 'panel' && (title || (!title && id == null)))) {
-                        for (var j = pages[i].panel.length; j--;) {
-                            if (pages[i].panel[j].button.html() == justtitle || pages[i].panel[j].button.html() == title || (name == 'panel' && !title && id == null)) {
-                                coll.push(pages[i].panel[j]);
+                var pages = [];
+                if (name == 'page' && dialog.page[id]) {
+                    pages.push(dialog.page[id]);
+                    name = name2;
+                    name = name && name.toLowerCase();
+                    title = title2;
+                    id = id2;
+                    justtitle = justtitle2;
+                } else {
+                    pages = dialog.page;
+                }
+                title = title && (title + '').replace(/"/g, '');
+                title2 = title2 && (title2 + '').replace(/"/g, '');
+                justtitle = justtitle && (justtitle + '').replace(/"/g, '');
+                justtitle2 = justtitle2 && (justtitle2 + '').replace(/"/g, '');
+                if (name || justtitle) {
+                    for (var i = pages.length; i--; ) {
+                        if (justtitle || (name == 'panel' && (title || (!title && id == null)))) {
+                            for (var j = pages[i].panel.length; j--; ) {
+                                if (
+                                    pages[i].panel[j].button.html() == justtitle ||
+                                    pages[i].panel[j].button.html() == title ||
+                                    (name == 'panel' && !title && id == null)
+                                ) {
+                                    coll.push(pages[i].panel[j]);
+                                }
                             }
                         }
-                    }
-                    if (justtitle || (name == 'button' && (title || (!title && id == null)))) {
-                        for (var j = pages[i].button.length; j--;) {
-                            if (pages[i].button[j].item.html() == justtitle || pages[i].button[j].item.html() == title || (name == 'button' && !title && id == null)) {
-                                coll.push(pages[i].button[j]);
+                        if (justtitle || (name == 'button' && (title || (!title && id == null)))) {
+                            for (var j = pages[i].button.length; j--; ) {
+                                if (
+                                    pages[i].button[j].item.html() == justtitle ||
+                                    pages[i].button[j].item.html() == title ||
+                                    (name == 'button' && !title && id == null)
+                                ) {
+                                    coll.push(pages[i].button[j]);
+                                }
                             }
                         }
+                        if (pages[i][name] && pages[i][name][id]) {
+                            coll.push(pages[i][name][id]);
+                        }
+                        if (name == 'header' && pages[i].header) {
+                            coll.push(pages[i].header);
+                        }
                     }
-                    if (pages[i][name] && pages[i][name][id]) {
-                        coll.push(pages[i][name][id]);
-                    }
-                    if (name == 'header' && pages[i].header) {
-                        coll.push(pages[i].header);
-                    }
+                } else {
+                    coll = coll.concat(pages);
                 }
-            } else {
-                coll = coll.concat(pages);
             }
-        });
+        );
         var res = {
-            length: coll.length
+            length: coll.length,
         };
-        for (var i = coll.length; i--;) {
+        for (var i = coll.length; i--; ) {
             res[i] = coll[i];
             for (var method in coll[i]) {
                 if (!(method in res)) {
                     (function (m) {
                         res[m] = function () {
-                            for (var j = this.length; j--;) {
+                            for (var j = this.length; j--; ) {
                                 if (typeof this[j][m] === 'function') {
                                     this[j][m].apply(this[j], arguments);
                                 }
                             }
                         };
-                    }(method));
+                    })(method);
                 }
             }
         }
@@ -1019,17 +1051,21 @@ var Dialog = (function () {
      */
     Dialog.prototype.updateHeight = function () {
         var height = 0;
-        var maxDialogHeight = $(window).height() - HEADER_HEIGHT - BUTTONS_HEIGHT - (MIN_DIALOG_VERTICAL_BUFFER * 2);
+        var maxDialogHeight =
+            $(window).height() - HEADER_HEIGHT - BUTTONS_HEIGHT - MIN_DIALOG_VERTICAL_BUFFER * 2;
         for (var i = 0; this.getPanel(i); i++) {
-            if (this.getPanel(i).body.css({height: 'auto', display: 'block'}).outerHeight() > height) {
+            if (
+                this.getPanel(i).body.css({ height: 'auto', display: 'block' }).outerHeight() >
+                height
+            ) {
                 height = Math.min(maxDialogHeight, this.getPanel(i).body.outerHeight());
             }
             if (i !== this.page[this.curpage].curtab) {
-                this.getPanel(i).body.css({display: 'none'});
+                this.getPanel(i).body.css({ display: 'none' });
             }
         }
         for (i = 0; this.getPanel(i); i++) {
-            this.getPanel(i).body.css({height: height || this.height});
+            this.getPanel(i).body.css({ height: height || this.height });
         }
         this.page[0].menu.height(height);
         this.height = height + HEADER_HEIGHT + BUTTONS_HEIGHT + 1;
@@ -1042,7 +1078,9 @@ var Dialog = (function () {
      * @method isMaximised
      */
     Dialog.prototype.isMaximised = function () {
-        return this.popup.element.outerHeight() >= $(window).height() - (MIN_DIALOG_VERTICAL_BUFFER * 2);
+        return (
+            this.popup.element.outerHeight() >= $(window).height() - MIN_DIALOG_VERTICAL_BUFFER * 2
+        );
     };
 
     /**
@@ -1062,21 +1100,17 @@ var Dialog = (function () {
     };
 
     return Dialog;
-
-}());
+})();
 
 Dialog = deprecate.construct(Dialog, 'Dialog constructor', {
-    alternativeName: 'Dialog2'
+    alternativeName: 'Dialog2',
 });
 
 createPopup = deprecate.construct(createPopup, 'Dialog popup constructor', {
-    alternatveName: 'Dialog2'
+    alternatveName: 'Dialog2',
 });
 
 globalize('Dialog', Dialog);
 globalize('popup', createPopup);
 
-export {
-    Dialog,
-    createPopup as popup
-};
+export { Dialog, createPopup as popup };