Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2920)

Unified Diff: chrome/browser/resources/md_downloads/crisper.js

Issue 2096903002: Revert of [Polymer] update polymer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/md_downloads/vulcanized.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/md_downloads/crisper.js
diff --git a/chrome/browser/resources/md_downloads/crisper.js b/chrome/browser/resources/md_downloads/crisper.js
index ed703d9045f52c4d196947d8390c5442e968a476..759aa368a709bc6caac84e62f201b573fad85b70 100644
--- a/chrome/browser/resources/md_downloads/crisper.js
+++ b/chrome/browser/resources/md_downloads/crisper.js
@@ -1933,9 +1933,7 @@
Polymer.IronA11yKeysBehavior = {
properties: {
/**
- * The EventTarget that will be firing relevant KeyboardEvents. Set it to
- * `null` to disable the listeners.
- * @type {?EventTarget}
+ * The HTMLElement that will be firing relevant KeyboardEvents.
*/
keyEventTarget: {
type: Object,
@@ -2075,7 +2073,7 @@
_resetKeyEventListeners: function() {
this._unlistenKeyEventListeners();
- if (this.isAttached && this.keyEventTarget) {
+ if (this.isAttached) {
this._listenKeyEventListeners();
}
},
@@ -2370,7 +2368,6 @@
var DEFAULT_PHYSICAL_COUNT = 3;
var HIDDEN_Y = '-10000px';
var DEFAULT_GRID_SIZE = 200;
- var SECRET_TABINDEX = -100;
Polymer({
@@ -3202,24 +3199,14 @@
if (!el || el._templateInstance.__key__ !== key) {
return;
}
+
if (dot >= 0) {
path = this.as + '.' + path.substring(dot+1);
el._templateInstance.notifyPath(path, value, true);
} else {
- // Update selection if needed
- var currentItem = el._templateInstance[this.as];
- if (Array.isArray(this.selectedItems)) {
- for (var i = 0; i < this.selectedItems.length; i++) {
- if (this.selectedItems[i] === currentItem) {
- this.set('selectedItems.' + i, value);
- break;
- }
- }
- } else if (this.selectedItem === currentItem) {
- this.set('selectedItem', value);
- }
el._templateInstance[this.as] = value;
}
+
},
/**
@@ -3407,9 +3394,9 @@
},
_updateGridMetrics: function() {
- this._viewportWidth = this.$.items.offsetWidth;
+ this._viewportWidth = this._scrollTargetWidth;
// Set item width to the value of the _physicalItems offsetWidth
- this._itemWidth = this._physicalCount > 0 ? this._physicalItems[0].getBoundingClientRect().width : DEFAULT_GRID_SIZE;
+ this._itemWidth = this._physicalCount > 0 ? this._physicalItems[0].offsetWidth : DEFAULT_GRID_SIZE;
// Set row height to the value of the _physicalItems offsetHeight
this._rowHeight = this._physicalCount > 0 ? this._physicalItems[0].offsetHeight : DEFAULT_GRID_SIZE;
// If in grid mode compute how many items with exist in each row
@@ -3736,32 +3723,12 @@
* Select an item from an event object.
*/
_selectionHandler: function(e) {
- var model = this.modelForElement(e.target);
- if (!model) {
- return;
- }
- var modelTabIndex, activeElTabIndex;
- 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])];
- // Safari does not focus certain form controls via mouse
- // https://bugs.webkit.org/show_bug.cgi?id=118043
- if (target.localName === 'input' ||
- target.localName === 'button' ||
- target.localName === 'select') {
- return;
- }
- // Set a temporary tabindex
- modelTabIndex = model.tabIndex;
- model.tabIndex = SECRET_TABINDEX;
- activeElTabIndex = activeEl ? activeEl.tabIndex : -1;
- model.tabIndex = modelTabIndex;
- // Only select the item if the tap wasn't on a focusable child
- // or the element bound to `tabIndex`
- if (activeEl && physicalItem.contains(activeEl) && activeElTabIndex !== SECRET_TABINDEX) {
- return;
- }
- this.toggleSelectionForItem(model[this.as]);
+ if (this.selectionEnabled) {
+ var model = this.modelForElement(e.target);
+ if (model) {
+ this.toggleSelectionForItem(model[this.as]);
+ }
+ }
},
_multiSelectionChanged: function(multiSelection) {
@@ -3834,18 +3801,19 @@
}
var physicalItem = this._physicalItems[this._getPhysicalIndex(idx)];
+ var SECRET = ~(Math.random() * 100);
var model = physicalItem._templateInstance;
var focusable;
// set a secret tab index
- model.tabIndex = SECRET_TABINDEX;
+ model.tabIndex = SECRET;
// check if focusable element is the physical item
- if (physicalItem.tabIndex === SECRET_TABINDEX) {
+ if (physicalItem.tabIndex === SECRET) {
focusable = physicalItem;
}
// search for the element which tabindex is bound to the secret tab index
if (!focusable) {
- focusable = Polymer.dom(physicalItem).querySelector('[tabindex="' + SECRET_TABINDEX + '"]');
+ focusable = Polymer.dom(physicalItem).querySelector('[tabindex="' + SECRET + '"]');
}
// restore the tab index
model.tabIndex = 0;
@@ -5322,7 +5290,16 @@
},
get target () {
- return this.keyEventTarget;
+ var ownerRoot = Polymer.dom(this).getOwnerRoot();
+ var target;
+
+ if (this.parentNode.nodeType == 11) { // DOCUMENT_FRAGMENT_NODE
+ target = ownerRoot.host;
+ } else {
+ target = this.parentNode;
+ }
+
+ return target;
},
keyBindings: {
@@ -5335,20 +5312,14 @@
// Set up a11yKeysBehavior to listen to key events on the target,
// so that space and enter activate the ripple even if the target doesn't
// handle key events. The key handlers deal with `noink` themselves.
- if (this.parentNode.nodeType == 11) { // DOCUMENT_FRAGMENT_NODE
- this.keyEventTarget = Polymer.dom(this).getOwnerRoot().host;
- } else {
- this.keyEventTarget = this.parentNode;
- }
- var keyEventTarget = /** @type {!EventTarget} */ (this.keyEventTarget);
- this.listen(keyEventTarget, 'up', 'uiUpAction');
- this.listen(keyEventTarget, 'down', 'uiDownAction');
+ this.keyEventTarget = this.target;
+ this.listen(this.target, 'up', 'uiUpAction');
+ this.listen(this.target, 'down', 'uiDownAction');
},
detached: function() {
- this.unlisten(this.keyEventTarget, 'up', 'uiUpAction');
- this.unlisten(this.keyEventTarget, 'down', 'uiDownAction');
- this.keyEventTarget = null;
+ this.unlisten(this.target, 'up', 'uiUpAction');
+ this.unlisten(this.target, 'down', 'uiDownAction');
},
get shouldKeepAnimating () {
@@ -5396,7 +5367,6 @@
ripple.downAction(event);
if (!this._animating) {
- this._animating = true;
this.animate();
}
},
@@ -5426,7 +5396,6 @@
ripple.upAction(event);
});
- this._animating = true;
this.animate();
},
@@ -5465,11 +5434,10 @@
},
animate: function() {
- if (!this._animating) {
- return;
- }
var index;
var ripple;
+
+ this._animating = true;
for (index = 0; index < this.ripples.length; ++index) {
ripple = this.ripples[index];
@@ -5515,15 +5483,6 @@
this.upAction();
}
}
-
- /**
- Fired when the animation finishes.
- This is useful if you want to wait until
- the ripple animation finishes to perform some action.
-
- @event transitionend
- @param {{node: Object}} detail Contains the animated node.
- */
});
})();
/**
@@ -7706,7 +7665,6 @@
/**
* Memoize information needed to position and size the target element.
- * @suppress {deprecated}
*/
_discoverInfo: function() {
if (this._fitInfo) {
@@ -8476,7 +8434,6 @@
* Returns the deepest overlay in the path.
* @param {Array<Element>=} path
* @return {Element|undefined}
- * @suppress {missingProperties}
* @private
*/
_overlayInPath: function(path) {
@@ -8534,11 +8491,12 @@
* @param {!Element} overlay1
* @param {!Element} overlay2
* @return {boolean}
- * @suppress {missingProperties}
* @private
*/
_shouldBeBehindOverlay: function(overlay1, overlay2) {
- return !overlay1.alwaysOnTop && overlay2.alwaysOnTop;
+ var o1 = /** @type {?} */ (overlay1);
+ var o2 = /** @type {?} */ (overlay2);
+ return !o1.alwaysOnTop && o2.alwaysOnTop;
}
};
« no previous file with comments | « no previous file | chrome/browser/resources/md_downloads/vulcanized.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698