update dialog polyfill to remove warning

worldmap/leaflet/dialog-polyfill.css

@@ -12,11 +12,11 @@ dialog {
   padding: 1em;
   background: white;
   color: black;
-  display: none;
+  display: block;
 }
 
-dialog[open] {
+dialog:not([open]) {
-  display: block;
+  display: none;
 }
 
 dialog + .backdrop {
@@ -25,16 +25,13 @@ dialog + .backdrop {
   background: rgba(0,0,0,0.1);
 }
 
-/* for small devices, modal dialogs go full-screen */
-@media screen and (max-width: 540px) {
-  dialog[_polyfill_modal] {  /* TODO: implement */
-    top: 0;
-    width: auto;
-    margin: 1em;
-  }
-}
-
 ._dialog_overlay {
   position: fixed;
   top: 0; right: 0; bottom: 0; left: 0;
 }
+
+dialog.fixed {
+  position: fixed;
+  top: 50%;
+  transform: translate(0, -50%);
+}

worldmap/leaflet/dialog-polyfill.js

@@ -1,7 +1,12 @@
-(function() {
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof define === 'function' && define.amd ? define(factory) :
+  (global = global || self, global.dialogPolyfill = factory());
+}(this, function () { 'use strict';
 
+  // nb. This is for IE10 and lower _only_.
   var supportCustomEvent = window.CustomEvent;
-  if (!supportCustomEvent || typeof supportCustomEvent == 'object') {
+  if (!supportCustomEvent || typeof supportCustomEvent === 'object') {
     supportCustomEvent = function CustomEvent(event, x) {
       x = x || {};
       var ev = document.createEvent('CustomEvent');
@@ -11,6 +16,33 @@
     supportCustomEvent.prototype = window.Event.prototype;
   }
 
+  /**
+   * @param {Element} el to check for stacking context
+   * @return {boolean} whether this el or its parents creates a stacking context
+   */
+  function createsStackingContext(el) {
+    while (el && el !== document.body) {
+      var s = window.getComputedStyle(el);
+      var invalid = function(k, ok) {
+        return !(s[k] === undefined || s[k] === ok);
+      };
+
+      if (s.opacity < 1 ||
+          invalid('zIndex', 'auto') ||
+          invalid('transform', 'none') ||
+          invalid('mixBlendMode', 'normal') ||
+          invalid('filter', 'none') ||
+          invalid('perspective', 'none') ||
+          s['isolation'] === 'isolate' ||
+          s.position === 'fixed' ||
+          s.webkitOverflowScrolling === 'touch') {
+        return true;
+      }
+      el = el.parentElement;
+    }
+    return false;
+  }
+
   /**
    * Finds the nearest <dialog> from the passed element.
    *
@@ -19,7 +51,7 @@
    */
   function findNearestDialog(el) {
     while (el) {
-      if (el.nodeName.toUpperCase() == 'DIALOG') {
+      if (el.localName === 'dialog') {
         return /** @type {HTMLDialogElement} */ (el);
       }
       el = el.parentElement;
@@ -35,7 +67,7 @@
    * @param {Element} el to blur
    */
   function safeBlur(el) {
-    if (el && el.blur && el != document.body) {
+    if (el && el.blur && el !== document.body) {
       el.blur();
     }
   }
@@ -47,13 +79,24 @@
    */
   function inNodeList(nodeList, node) {
     for (var i = 0; i < nodeList.length; ++i) {
-      if (nodeList[i] == node) {
+      if (nodeList[i] === node) {
         return true;
       }
     }
     return false;
   }
 
+  /**
+   * @param {HTMLFormElement} el to check
+   * @return {boolean} whether this form has method="dialog"
+   */
+  function isFormMethodDialog(el) {
+    if (!el || !el.hasAttribute('method')) {
+      return false;
+    }
+    return el.getAttribute('method').toLowerCase() === 'dialog';
+  }
+
   /**
    * @param {!HTMLDialogElement} dialog to upgrade
    * @constructor
@@ -76,13 +119,29 @@
       dialog.returnValue = '';
     }
 
-    this.maybeHideModal = this.maybeHideModal.bind(this);
     if ('MutationObserver' in window) {
-      // IE11+, most other browsers.
+      var mo = new MutationObserver(this.maybeHideModal.bind(this));
-      var mo = new MutationObserver(this.maybeHideModal);
+      mo.observe(dialog, {attributes: true, attributeFilter: ['open']});
-      mo.observe(dialog, { attributes: true, attributeFilter: ['open'] });
     } else {
-      dialog.addEventListener('DOMAttrModified', this.maybeHideModal);
+      // IE10 and below support. Note that DOMNodeRemoved etc fire _before_ removal. They also
+      // seem to fire even if the element was removed as part of a parent removal. Use the removed
+      // events to force downgrade (useful if removed/immediately added).
+      var removed = false;
+      var cb = function() {
+        removed ? this.downgradeModal() : this.maybeHideModal();
+        removed = false;
+      }.bind(this);
+      var timeout;
+      var delayModel = function(ev) {
+        if (ev.target !== dialog) { return; }  // not for a child element
+        var cand = 'DOMNodeRemoved';
+        removed |= (ev.type.substr(0, cand.length) === cand);
+        window.clearTimeout(timeout);
+        timeout = window.setTimeout(cb, 0);
+      };
+      ['DOMAttrModified', 'DOMNodeRemoved', 'DOMNodeRemovedFromDocument'].forEach(function(name) {
+        dialog.addEventListener(name, delayModel);
+      });
     }
     // Note that the DOM is observed inside DialogManager while any dialog
     // is being displayed as a modal, to catch modal removal from the DOM.
@@ -94,7 +153,7 @@
 
     this.backdrop_ = document.createElement('div');
     this.backdrop_.className = 'backdrop';
-    this.backdropClick_ = this.backdropClick_.bind(this);
+    this.backdrop_.addEventListener('click', this.backdropClick_.bind(this));
   }
 
   dialogPolyfillInfo.prototype = {
@@ -109,26 +168,28 @@
      * longer open or is no longer part of the DOM.
      */
     maybeHideModal: function() {
-      if (!this.openAsModal_) { return; }
+      if (this.dialog_.hasAttribute('open') && document.body.contains(this.dialog_)) { return; }
-      if (this.dialog_.hasAttribute('open') &&
+      this.downgradeModal();
-          document.body.contains(this.dialog_)) { return; }
+    },
 
+    /**
+     * Remove this dialog from the modal top layer, leaving it as a non-modal.
+     */
+    downgradeModal: function() {
+      if (!this.openAsModal_) { return; }
       this.openAsModal_ = false;
       this.dialog_.style.zIndex = '';
 
-      // This won't match the native <dialog> exactly because if the user set
+      // This won't match the native <dialog> exactly because if the user set top on a centered
-      // top on a centered polyfill dialog, that top gets thrown away when the
+      // polyfill dialog, that top gets thrown away when the dialog is closed. Not sure it's
-      // dialog is closed. Not sure it's possible to polyfill this perfectly.
+      // possible to polyfill this perfectly.
       if (this.replacedStyleTop_) {
         this.dialog_.style.top = '';
         this.replacedStyleTop_ = false;
       }
 
-      // Optimistically clear the modal part of this <dialog>.
+      // Clear the backdrop and remove from the manager.
-      this.backdrop_.removeEventListener('click', this.backdropClick_);
+      this.backdrop_.parentNode && this.backdrop_.parentNode.removeChild(this.backdrop_);
-      if (this.backdrop_.parentElement) {
-        this.backdrop_.parentElement.removeChild(this.backdrop_);
-      }
       dialogPolyfill.dm.removeDialog(this);
     },
 
@@ -151,6 +212,19 @@
      * @param {!Event} e to redirect
      */
     backdropClick_: function(e) {
+      if (!this.dialog_.hasAttribute('tabindex')) {
+        // Clicking on the backdrop should move the implicit cursor, even if dialog cannot be
+        // focused. Create a fake thing to focus on. If the backdrop was _before_ the dialog, this
+        // would not be needed - clicks would move the implicit cursor there.
+        var fake = document.createElement('div');
+        this.dialog_.insertBefore(fake, this.dialog_.firstChild);
+        fake.tabIndex = -1;
+        fake.focus();
+        this.dialog_.removeChild(fake);
+      } else {
+        this.dialog_.focus();
+      }
+
       var redirectedEvent = document.createEvent('MouseEvents');
       redirectedEvent.initMouseEvent(e.type, e.bubbles, e.cancelable, window,
           e.detail, e.screenX, e.screenY, e.clientX, e.clientY, e.ctrlKey,
@@ -166,6 +240,9 @@
     focus_: function() {
       // Find element with `autofocus` attribute, or fall back to the first form/tabindex control.
       var target = this.dialog_.querySelector('[autofocus]:not([disabled])');
+      if (!target && this.dialog_.tabIndex >= 0) {
+        target = this.dialog_;
+      }
       if (!target) {
         // Note that this is 'any focusable area'. This list is probably not exhaustive, but the
         // alternative involves stepping through and trying to focus everything.
@@ -184,12 +261,15 @@
     /**
      * Sets the zIndex for the backdrop and dialog.
      *
-     * @param {number} backdropZ
      * @param {number} dialogZ
+     * @param {number} backdropZ
      */
-    updateZIndex: function(backdropZ, dialogZ) {
+    updateZIndex: function(dialogZ, backdropZ) {
-      this.backdrop_.style.zIndex = backdropZ;
+      if (dialogZ < backdropZ) {
+        throw new Error('dialogZ should never be < backdropZ');
+      }
       this.dialog_.style.zIndex = dialogZ;
+      this.backdrop_.style.zIndex = backdropZ;
     },
 
     /**
@@ -215,7 +295,14 @@
       if (!dialogPolyfill.dm.pushDialog(this)) {
         throw new Error('Failed to execute \'showModal\' on dialog: There are too many open modal dialogs.');
       }
-      this.show();
+
+      if (createsStackingContext(this.dialog_.parentElement)) {
+        console.warn('A dialog is being shown inside a stacking context. ' +
+            'This may cause it to be unusable. For more information, see this link: ' +
+            'https://github.com/GoogleChrome/dialog-polyfill/#stacking-context');
+      }
+
+      this.setOpen(true);
       this.openAsModal_ = true;
 
       // Optionally center vertically, relative to the current viewport.
@@ -227,9 +314,10 @@
       }
 
       // Insert backdrop.
-      this.backdrop_.addEventListener('click', this.backdropClick_);
+      this.dialog_.parentNode.insertBefore(this.backdrop_, this.dialog_.nextSibling);
-      this.dialog_.parentNode.insertBefore(this.backdrop_,
+
-          this.dialog_.nextSibling);
+      // Focus on whatever inside the dialog.
+      this.focus_();
     },
 
     /**
@@ -275,8 +363,7 @@
       try {
         cssRules = styleSheet.cssRules;
       } catch (e) {}
-      if (!cssRules)
+      if (!cssRules) { continue; }
-        continue;
       for (var j = 0; j < cssRules.length; ++j) {
         var rule = cssRules[j];
         var selectedNodes = null;
@@ -284,12 +371,14 @@
         try {
           selectedNodes = document.querySelectorAll(rule.selectorText);
         } catch(e) {}
-        if (!selectedNodes || !inNodeList(selectedNodes, element))
+        if (!selectedNodes || !inNodeList(selectedNodes, element)) {
           continue;
+        }
         var cssTop = rule.style.getPropertyValue('top');
         var cssBottom = rule.style.getPropertyValue('bottom');
-        if ((cssTop && cssTop != 'auto') || (cssBottom && cssBottom != 'auto'))
+        if ((cssTop && cssTop !== 'auto') || (cssBottom && cssBottom !== 'auto')) {
           return true;
+        }
       }
     }
     return false;
@@ -297,7 +386,7 @@
 
   dialogPolyfill.needsCentering = function(dialog) {
     var computedStyle = window.getComputedStyle(dialog);
-    if (computedStyle.position != 'absolute') {
+    if (computedStyle.position !== 'absolute') {
       return false;
     }
 
@@ -305,9 +394,10 @@
     // WebKit/Blink, checking computedStyle.top == 'auto' is sufficient, but
     // Firefox returns the used value. So we do this crazy thing instead: check
     // the inline style and then go through CSS rules.
-    if ((dialog.style.top != 'auto' && dialog.style.top != '') ||
+    if ((dialog.style.top !== 'auto' && dialog.style.top !== '') ||
-        (dialog.style.bottom != 'auto' && dialog.style.bottom != ''))
+        (dialog.style.bottom !== 'auto' && dialog.style.bottom !== '')) {
       return false;
+    }
     return !dialogPolyfill.isInlinePositionSetByStylesheet(dialog);
   };
 
@@ -315,23 +405,21 @@
    * @param {!Element} element to force upgrade
    */
   dialogPolyfill.forceRegisterDialog = function(element) {
-    if (element.showModal) {
+    if (window.HTMLDialogElement || element.showModal) {
       console.warn('This browser already supports <dialog>, the polyfill ' +
           'may not work correctly', element);
     }
-    if (element.nodeName.toUpperCase() != 'DIALOG') {
+    if (element.localName !== 'dialog') {
       throw new Error('Failed to register dialog: The element is not a dialog.');
     }
     new dialogPolyfillInfo(/** @type {!HTMLDialogElement} */ (element));
   };
 
   /**
-   * @param {!Element} element to upgrade
+   * @param {!Element} element to upgrade, if necessary
    */
   dialogPolyfill.registerDialog = function(element) {
-    if (element.showModal) {
+    if (!element.showModal) {
-      console.warn('Can\'t upgrade <dialog>: already supported', element);
-    } else {
       dialogPolyfill.forceRegisterDialog(element);
     }
   };
@@ -343,6 +431,8 @@
     /** @type {!Array<!dialogPolyfillInfo>} */
     this.pendingDialogStack = [];
 
+    var checkDOM = this.checkDOM_.bind(this);
+
     // The overlay is used to simulate how a modal dialog blocks the document.
     // The blocking dialog is positioned on top of the overlay, and the rest of
     // the dialogs on the pending dialog stack are positioned below it. In the
@@ -351,26 +441,35 @@
     this.overlay = document.createElement('div');
     this.overlay.className = '_dialog_overlay';
     this.overlay.addEventListener('click', function(e) {
+      this.forwardTab_ = undefined;
       e.stopPropagation();
-    });
+      checkDOM([]);  // sanity-check DOM
+    }.bind(this));
 
     this.handleKey_ = this.handleKey_.bind(this);
     this.handleFocus_ = this.handleFocus_.bind(this);
-    this.handleRemove_ = this.handleRemove_.bind(this);
 
     this.zIndexLow_ = 100000;
     this.zIndexHigh_ = 100000 + 150;
-  };
 
-  /**
+    this.forwardTab_ = undefined;
-   * @return {Element} the top HTML dialog element, if any
+
-   */
+    if ('MutationObserver' in window) {
-  dialogPolyfill.DialogManager.prototype.topDialogElement = function() {
+      this.mo_ = new MutationObserver(function(records) {
-    if (this.pendingDialogStack.length) {
+        var removed = [];
-      var t = this.pendingDialogStack[this.pendingDialogStack.length - 1];
+        records.forEach(function(rec) {
-      return t.dialog;
+          for (var i = 0, c; c = rec.removedNodes[i]; ++i) {
+            if (!(c instanceof Element)) {
+              continue;
+            } else if (c.localName === 'dialog') {
+              removed.push(c);
+            }
+            removed = removed.concat(c.querySelectorAll('dialog'));
+          }
+        });
+        removed.length && checkDOM(removed);
+      });
     }
-    return null;
   };
 
   /**
@@ -378,10 +477,9 @@
    * handlers.
    */
   dialogPolyfill.DialogManager.prototype.blockDocument = function() {
-    document.body.appendChild(this.overlay);
+    document.documentElement.addEventListener('focus', this.handleFocus_, true);
-    document.body.addEventListener('focus', this.handleFocus_, true);
     document.addEventListener('keydown', this.handleKey_);
-    document.addEventListener('DOMNodeRemoved', this.handleRemove_);
+    this.mo_ && this.mo_.observe(document, {childList: true, subtree: true});
   };
 
   /**
@@ -389,63 +487,111 @@
    * dialogs are visible.
    */
   dialogPolyfill.DialogManager.prototype.unblockDocument = function() {
-    document.body.removeChild(this.overlay);
+    document.documentElement.removeEventListener('focus', this.handleFocus_, true);
-    document.body.removeEventListener('focus', this.handleFocus_, true);
     document.removeEventListener('keydown', this.handleKey_);
-    document.removeEventListener('DOMNodeRemoved', this.handleRemove_);
+    this.mo_ && this.mo_.disconnect();
   };
 
+  /**
+   * Updates the stacking of all known dialogs.
+   */
   dialogPolyfill.DialogManager.prototype.updateStacking = function() {
-    var zIndex = this.zIndexLow_;
+    var zIndex = this.zIndexHigh_;
 
-    for (var i = 0; i < this.pendingDialogStack.length; i++) {
+    for (var i = 0, dpi; dpi = this.pendingDialogStack[i]; ++i) {
-      if (i == this.pendingDialogStack.length - 1) {
+      dpi.updateZIndex(--zIndex, --zIndex);
-        this.overlay.style.zIndex = zIndex++;
+      if (i === 0) {
+        this.overlay.style.zIndex = --zIndex;
       }
-      this.pendingDialogStack[i].updateZIndex(zIndex++, zIndex++);
     }
+
+    // Make the overlay a sibling of the dialog itself.
+    var last = this.pendingDialogStack[0];
+    if (last) {
+      var p = last.dialog.parentNode || document.body;
+      p.appendChild(this.overlay);
+    } else if (this.overlay.parentNode) {
+      this.overlay.parentNode.removeChild(this.overlay);
+    }
+  };
+
+  /**
+   * @param {Element} candidate to check if contained or is the top-most modal dialog
+   * @return {boolean} whether candidate is contained in top dialog
+   */
+  dialogPolyfill.DialogManager.prototype.containedByTopDialog_ = function(candidate) {
+    while (candidate = findNearestDialog(candidate)) {
+      for (var i = 0, dpi; dpi = this.pendingDialogStack[i]; ++i) {
+        if (dpi.dialog === candidate) {
+          return i === 0;  // only valid if top-most
+        }
+      }
+      candidate = candidate.parentElement;
+    }
+    return false;
   };
 
   dialogPolyfill.DialogManager.prototype.handleFocus_ = function(event) {
-    var candidate = findNearestDialog(/** @type {Element} */ (event.target));
+    if (this.containedByTopDialog_(event.target)) { return; }
-    if (candidate != this.topDialogElement()) {
+
-      event.preventDefault();
+    if (document.activeElement === document.documentElement) { return; }
-      event.stopPropagation();
+
-      safeBlur(/** @type {Element} */ (event.target));
+    event.preventDefault();
-      // TODO: Focus on the browser chrome (aka document) or the dialog itself
+    event.stopPropagation();
-      // depending on the tab direction.
+    safeBlur(/** @type {Element} */ (event.target));
-      return false;
+
+    if (this.forwardTab_ === undefined) { return; }  // move focus only from a tab key
+
+    var dpi = this.pendingDialogStack[0];
+    var dialog = dpi.dialog;
+    var position = dialog.compareDocumentPosition(event.target);
+    if (position & Node.DOCUMENT_POSITION_PRECEDING) {
+      if (this.forwardTab_) {
+        // forward
+        dpi.focus_();
+      } else if (event.target !== document.documentElement) {
+        // backwards if we're not already focused on <html>
+        document.documentElement.focus();
+      }
     }
+
+    return false;
   };
 
   dialogPolyfill.DialogManager.prototype.handleKey_ = function(event) {
-    if (event.keyCode == 27) {
+    this.forwardTab_ = undefined;
+    if (event.keyCode === 27) {
       event.preventDefault();
       event.stopPropagation();
       var cancelEvent = new supportCustomEvent('cancel', {
         bubbles: false,
         cancelable: true
       });
-      var dialog = this.topDialogElement();
+      var dpi = this.pendingDialogStack[0];
-      if (dialog.dispatchEvent(cancelEvent)) {
+      if (dpi && dpi.dialog.dispatchEvent(cancelEvent)) {
-        dialog.close();
+        dpi.dialog.close();
       }
+    } else if (event.keyCode === 9) {
+      this.forwardTab_ = !event.shiftKey;
     }
   };
 
-  dialogPolyfill.DialogManager.prototype.handleRemove_ = function(event) {
+  /**
-    if (event.target.nodeName.toUpperCase() != 'DIALOG') { return; }
+   * Finds and downgrades any known modal dialogs that are no longer displayed. Dialogs that are
-
+   * removed and immediately readded don't stay modal, they become normal.
-    var dialog = /** @type {HTMLDialogElement} */ (event.target);
+   *
-    if (!dialog.open) { return; }
+   * @param {!Array<!HTMLDialogElement>} removed that have definitely been removed
-
+   */
-    // Find a dialogPolyfillInfo which matches the removed <dialog>.
+  dialogPolyfill.DialogManager.prototype.checkDOM_ = function(removed) {
-    this.pendingDialogStack.some(function(dpi) {
+    // This operates on a clone because it may cause it to change. Each change also calls
-      if (dpi.dialog == dialog) {
+    // updateStacking, which only actually needs to happen once. But who removes many modal dialogs
-        // This call will clear the dialogPolyfillInfo on this DialogManager
+    // at a time?!
-        // as a side effect.
+    var clone = this.pendingDialogStack.slice();
+    clone.forEach(function(dpi) {
+      if (removed.indexOf(dpi.dialog) !== -1) {
+        dpi.downgradeModal();
+      } else {
         dpi.maybeHideModal();
-        return true;
       }
     });
   };
@@ -459,8 +605,7 @@
     if (this.pendingDialogStack.length >= allowed) {
       return false;
     }
-    this.pendingDialogStack.push(dpi);
+    if (this.pendingDialogStack.unshift(dpi) === 1) {
-    if (this.pendingDialogStack.length == 1) {
       this.blockDocument();
     }
     this.updateStacking();
@@ -468,59 +613,124 @@
   };
 
   /**
-   * @param {dialogPolyfillInfo} dpi
+   * @param {!dialogPolyfillInfo} dpi
    */
   dialogPolyfill.DialogManager.prototype.removeDialog = function(dpi) {
     var index = this.pendingDialogStack.indexOf(dpi);
-    if (index == -1) { return; }
+    if (index === -1) { return; }
 
     this.pendingDialogStack.splice(index, 1);
-    this.updateStacking();
+    if (this.pendingDialogStack.length === 0) {
-    if (this.pendingDialogStack.length == 0) {
       this.unblockDocument();
     }
+    this.updateStacking();
   };
 
   dialogPolyfill.dm = new dialogPolyfill.DialogManager();
+  dialogPolyfill.formSubmitter = null;
+  dialogPolyfill.useValue = null;
 
   /**
-   * Global form 'dialog' method handler. Closes a dialog correctly on submit
+   * Installs global handlers, such as click listers and native method overrides. These are needed
-   * and possibly sets its return value.
+   * even if a no dialog is registered, as they deal with <form method="dialog">.
    */
-  document.addEventListener('submit', function(ev) {
+  if (window.HTMLDialogElement === undefined) {
-    var target = ev.target;
-    if (!target || !target.hasAttribute('method')) { return; }
-    if (target.getAttribute('method').toLowerCase() != 'dialog') { return; }
-    ev.preventDefault();
 
-    var dialog = findNearestDialog(/** @type {Element} */ (ev.target));
+    /**
-    if (!dialog) { return; }
+     * If HTMLFormElement translates method="DIALOG" into 'get', then replace the descriptor with
-
+     * one that returns the correct value.
-    // FIXME: The original event doesn't contain the element used to submit the
+     */
-    // form (if any). Look in some possible places.
+    var testForm = document.createElement('form');
-    var returnValue;
+    testForm.setAttribute('method', 'dialog');
-    var cands = [document.activeElement, ev.explicitOriginalTarget];
+    if (testForm.method !== 'dialog') {
-    var els = ['BUTTON', 'INPUT'];
+      var methodDescriptor = Object.getOwnPropertyDescriptor(HTMLFormElement.prototype, 'method');
-    cands.some(function(cand) {
+      if (methodDescriptor) {
-      if (cand && cand.form == ev.target && els.indexOf(cand.nodeName.toUpperCase()) != -1) {
+        // nb. Some older iOS and older PhantomJS fail to return the descriptor. Don't do anything
-        returnValue = cand.value;
+        // and don't bother to update the element.
-        return true;
+        var realGet = methodDescriptor.get;
+        methodDescriptor.get = function() {
+          if (isFormMethodDialog(this)) {
+            return 'dialog';
+          }
+          return realGet.call(this);
+        };
+        var realSet = methodDescriptor.set;
+        methodDescriptor.set = function(v) {
+          if (typeof v === 'string' && v.toLowerCase() === 'dialog') {
+            return this.setAttribute('method', v);
+          }
+          return realSet.call(this, v);
+        };
+        Object.defineProperty(HTMLFormElement.prototype, 'method', methodDescriptor);
       }
-    });
+    }
-    dialog.close(returnValue);
-  }, true);
 
-  dialogPolyfill['forceRegisterDialog'] = dialogPolyfill.forceRegisterDialog;
+    /**
-  dialogPolyfill['registerDialog'] = dialogPolyfill.registerDialog;
+     * Global 'click' handler, to capture the <input type="submit"> or <button> element which has
+     * submitted a <form method="dialog">. Needed as Safari and others don't report this inside
+     * document.activeElement.
+     */
+    document.addEventListener('click', function(ev) {
+      dialogPolyfill.formSubmitter = null;
+      dialogPolyfill.useValue = null;
+      if (ev.defaultPrevented) { return; }  // e.g. a submit which prevents default submission
 
-  if (typeof define === 'function' && 'amd' in define) {
+      var target = /** @type {Element} */ (ev.target);
-    // AMD support
+      if (!target || !isFormMethodDialog(target.form)) { return; }
-    define(function() { return dialogPolyfill; });
+
-  } else if (typeof module === 'object' && typeof module['exports'] === 'object') {
+      var valid = (target.type === 'submit' && ['button', 'input'].indexOf(target.localName) > -1);
-    // CommonJS support
+      if (!valid) {
-    module['exports'] = dialogPolyfill;
+        if (!(target.localName === 'input' && target.type === 'image')) { return; }
-  } else {
+        // this is a <input type="image">, which can submit forms
-    // all others
+        dialogPolyfill.useValue = ev.offsetX + ',' + ev.offsetY;
-    window['dialogPolyfill'] = dialogPolyfill;
+      }
+
+      var dialog = findNearestDialog(target);
+      if (!dialog) { return; }
+
+      dialogPolyfill.formSubmitter = target;
+
+    }, false);
+
+    /**
+     * Replace the native HTMLFormElement.submit() method, as it won't fire the
+     * submit event and give us a chance to respond.
+     */
+    var nativeFormSubmit = HTMLFormElement.prototype.submit;
+    var replacementFormSubmit = function () {
+      if (!isFormMethodDialog(this)) {
+        return nativeFormSubmit.call(this);
+      }
+      var dialog = findNearestDialog(this);
+      dialog && dialog.close();
+    };
+    HTMLFormElement.prototype.submit = replacementFormSubmit;
+
+    /**
+     * Global form 'dialog' method handler. Closes a dialog correctly on submit
+     * and possibly sets its return value.
+     */
+    document.addEventListener('submit', function(ev) {
+      var form = /** @type {HTMLFormElement} */ (ev.target);
+      if (!isFormMethodDialog(form)) { return; }
+      ev.preventDefault();
+
+      var dialog = findNearestDialog(form);
+      if (!dialog) { return; }
+
+      // Forms can only be submitted via .submit() or a click (?), but anyway: sanity-check that
+      // the submitter is correct before using its value as .returnValue.
+      var s = dialogPolyfill.formSubmitter;
+      if (s && s.form === form) {
+        dialog.close(dialogPolyfill.useValue || s.value);
+      } else {
+        dialog.close();
+      }
+      dialogPolyfill.formSubmitter = null;
+
+    }, true);
   }
-})();
+
+  return dialogPolyfill;
+
+}));

worldmap/worldmap.appcache

@@ -28,8 +28,6 @@ leaflet/l.ellipse.min.js
 leaflet/leaflet-heat.js
 leaflet/leaflet-omnivore.min.js
 leaflet/leaflet-side-by-side.js
-leaflet/leaflet-slider.css
-leaflet/leaflet-slider.js
 leaflet/leaflet-velocity.min.css
 leaflet/leaflet-velocity.min.js
 leaflet/leaflet.active-layers.min.js