OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 /** | 5 /** |
6 * @fileoverview | 6 * @fileoverview |
7 * 'site-list' shows a list of Allowed and Blocked sites for a given | 7 * 'site-list' shows a list of Allowed and Blocked sites for a given |
8 * category. | 8 * category. |
9 */ | 9 */ |
10 Polymer({ | 10 Polymer({ |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 var host1 = self.toUrl_(a.embeddingOrigin); | 360 var host1 = self.toUrl_(a.embeddingOrigin); |
361 var host2 = self.toUrl_(b.embeddingOrigin); | 361 var host2 = self.toUrl_(b.embeddingOrigin); |
362 host1 = (host1 == null) ? '' : host1.host; | 362 host1 = (host1 == null) ? '' : host1.host; |
363 host2 = (host2 == null) ? '' : host2.host; | 363 host2 = (host2 == null) ? '' : host2.host; |
364 return host1.localeCompare(host2); | 364 return host1.localeCompare(host2); |
365 } | 365 } |
366 } | 366 } |
367 } | 367 } |
368 return comparison; | 368 return comparison; |
369 }); | 369 }); |
370 var results = /** @type {!Array<SiteException>} */ []; | 370 var results = /** @type {!Array<SiteException>} */([]); |
371 var lastOrigin = ''; | 371 var lastOrigin = ''; |
372 var lastEmbeddingOrigin = ''; | 372 var lastEmbeddingOrigin = ''; |
373 for (var i = 0; i < sites.length; ++i) { | 373 for (var i = 0; i < sites.length; ++i) { |
374 var origin = sites[i].origin; | 374 var origin = sites[i].origin; |
375 var originForDisplay = this.sanitizePort(origin.replace('[*.]', '')); | 375 var originForDisplay = this.sanitizePort(this.toUrl_(origin).origin); |
376 | 376 |
377 var embeddingOrigin = sites[i].embeddingOrigin; | 377 var embeddingOrigin = sites[i].embeddingOrigin; |
378 var embeddingOriginForDisplay = ''; | 378 var embeddingOriginForDisplay = ''; |
379 if (origin != embeddingOrigin) { | 379 if (origin != embeddingOrigin) { |
380 embeddingOriginForDisplay = | 380 embeddingOriginForDisplay = |
381 this.getEmbedderString(embeddingOrigin, this.category); | 381 this.getEmbedderString(embeddingOrigin, this.category); |
382 } | 382 } |
383 | 383 |
384 // The All Sites category can contain duplicates (from other categories). | 384 // The All Sites category can contain duplicates (from other categories). |
385 if (originForDisplay == lastOrigin && | 385 if (originForDisplay == lastOrigin && |
386 embeddingOriginForDisplay == lastEmbeddingOrigin) { | 386 embeddingOriginForDisplay == lastEmbeddingOrigin) { |
387 continue; | 387 continue; |
388 } | 388 } |
389 | 389 |
390 results.push({ | 390 results.push({ |
391 origin: origin, | 391 origin: origin, |
392 originForDisplay: originForDisplay, | 392 originForDisplay: originForDisplay, |
393 embeddingOrigin: embeddingOrigin, | 393 embeddingOrigin: embeddingOrigin, |
394 embeddingOriginForDisplay: embeddingOriginForDisplay, | 394 embeddingOriginForDisplay: embeddingOriginForDisplay, |
395 incognito: sites[i].incognito, | 395 incognito: sites[i].incognito, |
| 396 setting: sites[i].setting, |
396 source: sites[i].source, | 397 source: sites[i].source, |
397 }); | 398 }); |
398 | 399 |
399 lastOrigin = originForDisplay; | 400 lastOrigin = originForDisplay; |
400 lastEmbeddingOrigin = embeddingOriginForDisplay; | 401 lastEmbeddingOrigin = embeddingOriginForDisplay; |
401 } | 402 } |
402 return results; | 403 return results; |
403 }, | 404 }, |
404 | 405 |
405 /** | 406 /** |
(...skipping 27 matching lines...) Expand all Loading... |
433 | 434 |
434 /** | 435 /** |
435 * A handler for selecting a site (by clicking on the origin). | 436 * A handler for selecting a site (by clicking on the origin). |
436 * @private | 437 * @private |
437 */ | 438 */ |
438 onOriginTap_: function(event) { | 439 onOriginTap_: function(event) { |
439 this.selectedSite = event.model.item; | 440 this.selectedSite = event.model.item; |
440 if (this.isPolicyControlled_(this.selectedSite.source)) | 441 if (this.isPolicyControlled_(this.selectedSite.source)) |
441 return; | 442 return; |
442 | 443 |
443 settings.navigateTo(settings.Route.SITE_SETTINGS_SITE_DETAILS); | 444 settings.navigateTo(settings.Route.SITE_SETTINGS_SITE_DETAILS, |
| 445 new URLSearchParams('site=' + this.selectedSite.origin)); |
444 }, | 446 }, |
445 | 447 |
446 /** | 448 /** |
447 * A handler for activating one of the menu action items. | 449 * A handler for activating one of the menu action items. |
448 * @param {!{model: !{item: !{origin: string}}, | 450 * @param {!{model: !{item: !{origin: string}}, |
449 * detail: !{selected: string}}} event | 451 * detail: !{selected: string}}} event |
450 * @private | 452 * @private |
451 */ | 453 */ |
452 onActionMenuIronActivate_: function(event) { | 454 onActionMenuIronActivate_: function(event) { |
453 var origin = event.model.item.origin; | 455 var origin = event.model.item.origin; |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 // is redundant to also list all the sites that are blocked. | 535 // is redundant to also list all the sites that are blocked. |
534 if (this.isAllowList_()) | 536 if (this.isAllowList_()) |
535 return true; | 537 return true; |
536 | 538 |
537 if (this.isSessionOnlyList_()) | 539 if (this.isSessionOnlyList_()) |
538 return siteList.length > 0; | 540 return siteList.length > 0; |
539 | 541 |
540 return toggleState; | 542 return toggleState; |
541 }, | 543 }, |
542 }); | 544 }); |
OLD | NEW |