Roll Polymer

chrome/browser/resources/md_history/app.crisper.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 function PromiseResolver() {
   this.resolve_;
   this.reject_;
   this.promise_ = new Promise(function(resolve, reject) {
     this.resolve_ = resolve;
     this.reject_ = reject;
   }.bind(this));
@@ skipping 3345 matching lines @@
         break;
       }
     }
   },
   _focusPrevious: function() {
     var length = this.items.length;
     var curFocusIndex = Number(this.indexOf(this.focusedItem));
     for (var i = 1; i < length + 1; i++) {
       var item = this.items[(curFocusIndex - i + length) % length];
       if (!item.hasAttribute('disabled')) {
+        var owner = Polymer.dom(item).getOwnerRoot() || document;
         this._setFocusedItem(item);
-        return;
+        if (Polymer.dom(owner).activeElement == item) {
+          return;
+        }
       }
     }
   },
   _focusNext: function() {
     var length = this.items.length;
     var curFocusIndex = Number(this.indexOf(this.focusedItem));
     for (var i = 1; i < length + 1; i++) {
       var item = this.items[(curFocusIndex + i) % length];
       if (!item.hasAttribute('disabled')) {
+        var owner = Polymer.dom(item).getOwnerRoot() || document;
         this._setFocusedItem(item);
-        return;
+        if (Polymer.dom(owner).activeElement == item) {
+          return;
+        }
       }
     }
   },
   _applySelection: function(item, isSelected) {
     if (isSelected) {
       item.setAttribute('aria-selected', 'true');
     } else {
       item.removeAttribute('aria-selected');
     }
     Polymer.IronSelectableBehavior._applySelection.apply(this, arguments);
@@ skipping 2611 matching lines @@
       return Polymer.dom(this.$.content).getDistributedNodes()[0];
     },
     get _focusTarget() {
       return this.focusTarget || this.containedElement;
     },
     ready: function() {
       this._scrollTop = 0;
       this._scrollLeft = 0;
       this._refitOnScrollRAF = null;
     },
+    attached: function() {
+      if (!this.sizingTarget || this.sizingTarget === this) {
+        this.sizingTarget = this.containedElement;
+      }
+    },
     detached: function() {
       this.cancelAnimation();
+      document.removeEventListener('scroll', this._boundOnCaptureScroll);
       Polymer.IronDropdownScrollManager.removeScrollLock(this);
     },
     _openedChanged: function() {
       if (this.opened && this.disabled) {
         this.cancel();
       } else {
         this.cancelAnimation();
-        this.sizingTarget = this.containedElement || this.sizingTarget;
         this._updateAnimationConfig();
         this._saveScrollPosition();
         if (this.opened) {
           document.addEventListener('scroll', this._boundOnCaptureScroll);
           !this.allowOutsideScroll && Polymer.IronDropdownScrollManager.pushScrollLock(this);
         } else {
           document.removeEventListener('scroll', this._boundOnCaptureScroll);
           Polymer.IronDropdownScrollManager.removeScrollLock(this);
         }
         Polymer.IronOverlayBehaviorImpl._openedChanged.apply(this, arguments);
@@ skipping 387 matching lines @@
       observer: '_horizontalChanged'
     },
     opened: {
       type: Boolean,
       value: false,
       notify: true,
       observer: '_openedChanged'
     },
     noAnimation: {
       type: Boolean
+    },
+    _desiredSize: {
+      type: String,
+      value: ''
     }
   },
   get dimension() {
     return this.horizontal ? 'width' : 'height';
   },
   get _dimensionMax() {
     return this.horizontal ? 'maxWidth' : 'maxHeight';
   },
   get _dimensionMaxCss() {
     return this.horizontal ? 'max-width' : 'max-height';
@@ skipping 12 matching lines @@
   toggle: function() {
     this.opened = !this.opened;
   },
   show: function() {
     this.opened = true;
   },
   hide: function() {
     this.opened = false;
   },
   updateSize: function(size, animated) {
-    var curSize = this.style[this._dimensionMax];
-    if (curSize === size || size === 'auto' && !curSize) {
+    size = size === 'auto' ? '' : size;
+    if (this._desiredSize === size) {
       return;
     }
+    this._desiredSize = size;
     this._updateTransition(false);
-    if (animated && !this.noAnimation && this._isDisplayed) {
+    var willAnimate = animated && !this.noAnimation && this._isDisplayed;
+    if (willAnimate) {
       var startSize = this._calcSize();
-      if (size === 'auto') {
+      if (size === '') {
         this.style[this._dimensionMax] = '';
         size = this._calcSize();
       }
       this.style[this._dimensionMax] = startSize;
       this.scrollTop = this.scrollTop;
       this._updateTransition(true);
+      willAnimate = size !== startSize;
     }
-    if (size === 'auto') {
-      this.style[this._dimensionMax] = '';
-    } else {
-      this.style[this._dimensionMax] = size;
+    this.style[this._dimensionMax] = size;
+    if (!willAnimate) {
+      this._transitionEnd();
     }
   },
   enableTransition: function(enabled) {
     Polymer.Base._warn('`enableTransition()` is deprecated, use `noAnimation` instead.');
     this.noAnimation = !enabled;
   },
   _updateTransition: function(enabled) {
     this.style.transitionDuration = enabled && !this.noAnimation ? '' : '0s';
   },
   _horizontalChanged: function() {
     this.style.transitionProperty = this._dimensionMaxCss;
     var otherDimension = this._dimensionMax === 'maxWidth' ? 'maxHeight' : 'maxWidth';
     this.style[otherDimension] = '';
     this.updateSize(this.opened ? 'auto' : '0px', false);
   },
   _openedChanged: function() {
     this.setAttribute('aria-expanded', this.opened);
     this.setAttribute('aria-hidden', !this.opened);
     this.toggleClass('iron-collapse-closed', false);
     this.toggleClass('iron-collapse-opened', false);
     this.updateSize(this.opened ? 'auto' : '0px', true);
     if (this.opened) {
       this.focus();
     }
-    if (this.noAnimation) {
-      this._transitionEnd();
-    }
   },
   _transitionEnd: function() {
-    if (this.opened) {
-      this.style[this._dimensionMax] = '';
-    }
+    this.style[this._dimensionMax] = this._desiredSize;
     this.toggleClass('iron-collapse-closed', !this.opened);
     this.toggleClass('iron-collapse-opened', this.opened);
     this._updateTransition(false);
     this.notifyResize();
   },
   get _isDisplayed() {
     var rect = this.getBoundingClientRect();
     for (var prop in rect) {
       if (rect[prop] !== 0) return true;
     }
@@ skipping 111 matching lines @@
     role: 'checkbox',
     'aria-checked': false,
     tabindex: 0
   },
   properties: {
     ariaActiveAttribute: {
       type: String,
       value: 'aria-checked'
     }
   },
+  attached: function() {
+    var inkSize = this.getComputedStyleValue('--calculated-paper-checkbox-ink-size');
+    if (inkSize === '-1px') {
+      var checkboxSize = parseFloat(this.getComputedStyleValue('--calculated-paper-checkbox-size'));
+      var defaultInkSize = Math.floor(8 / 3 * checkboxSize);
+      if (defaultInkSize % 2 !== checkboxSize % 2) {
+        defaultInkSize++;
+      }
+      this.customStyle['--paper-checkbox-ink-size'] = defaultInkSize + 'px';
+      this.updateStyles();
+    }
+  },
   _computeCheckboxClass: function(checked, invalid) {
     var className = '';
     if (checked) {
       className += 'checked ';
     }
     if (invalid) {
       className += 'invalid';
     }
     return className;
   },
@@ skipping 1048 matching lines @@
       }
     },
     scrollToItem: function(item) {
       return this.scrollToIndex(this.items.indexOf(item));
     },
     scrollToIndex: function(idx) {
       if (typeof idx !== 'number' || idx < 0 || idx > this.items.length - 1) {
         return;
       }
       Polymer.dom.flush();
+      if (!this._itemsRendered) {
+        return;
+      }
       idx = Math.min(Math.max(idx, 0), this._virtualCount - 1);
       if (!this._isIndexRendered(idx) || idx >= this._maxVirtualStart) {
         this._virtualStart = this.grid ? idx - this._itemsPerRow * 2 : idx - 1;
       }
       this._manageFocus();
       this._assignModels();
       this._updateMetrics();
-      var estPhysicalTop = Math.floor(this._virtualStart / this._itemsPerRow) * this._physicalAverage;
-      this._physicalTop = estPhysicalTop;
+      this._physicalTop = Math.floor(this._virtualStart / this._itemsPerRow) * this._physicalAverage;
       var currentTopItem = this._physicalStart;
       var currentVirtualItem = this._virtualStart;
       var targetOffsetTop = 0;
       var hiddenContentSize = this._hiddenContentSize;
       while (currentVirtualItem < idx && targetOffsetTop <= hiddenContentSize) {
         targetOffsetTop = targetOffsetTop + this._getPhysicalSizeIncrement(currentTopItem);
         currentTopItem = (currentTopItem + 1) % this._physicalCount;
         currentVirtualItem++;
       }
       this._updateScrollerSize(true);
@@ skipping 97 matching lines @@
       var target = Polymer.dom(e).path[0];
       var activeEl = Polymer.dom(this.domHost ? this.domHost.root : document).activeElement;
       var physicalItem = this._physicalItems[this._getPhysicalIndex(model[this.indexAs])];
       if (target.localName === 'input' || target.localName === 'button' || target.localName === 'select') {
         return;
       }
       modelTabIndex = model.tabIndex;
       model.tabIndex = SECRET_TABINDEX;
       activeElTabIndex = activeEl ? activeEl.tabIndex : -1;
       model.tabIndex = modelTabIndex;
-      if (activeEl && physicalItem.contains(activeEl) && activeElTabIndex !== SECRET_TABINDEX) {
+      if (activeEl && physicalItem !== activeEl && physicalItem.contains(activeEl) && activeElTabIndex !== SECRET_TABINDEX) {
         return;
       }
       this.toggleSelectionForItem(model[this.as]);
     },
     _multiSelectionChanged: function(multiSelection) {
       this.clearSelection();
       this.$.selector.multi = multiSelection;
     },
     updateSizeForItem: function(item) {
       item = this._getNormalizedItem(item);
@@ skipping 948 matching lines @@
 
        case HistoryRange.MONTH:
         histogramValue = HistoryPageViewHistogram.GROUPED_MONTH;
         break;
       }
       break;
     }
     md_history.BrowserService.getInstance().recordHistogram('History.HistoryPageView', histogramValue, HistoryPageViewHistogram.END);
   }
 });