@@ -222,7 +222,7 @@ goog.dom.safe.setFormElementAction = function(form, url) {
222
222
if ( url instanceof goog . html . SafeUrl ) {
223
223
safeUrl = url ;
224
224
} else {
225
- safeUrl = goog . html . SafeUrl . sanitizeAssertUnchanged ( url ) ;
225
+ safeUrl = goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ;
226
226
}
227
227
goog . asserts . dom . assertIsHtmlFormElement ( form ) . action =
228
228
goog . html . SafeUrl . unwrap ( safeUrl ) ;
@@ -255,7 +255,7 @@ goog.dom.safe.setButtonFormAction = function(button, url) {
255
255
if ( url instanceof goog . html . SafeUrl ) {
256
256
safeUrl = url ;
257
257
} else {
258
- safeUrl = goog . html . SafeUrl . sanitizeAssertUnchanged ( url ) ;
258
+ safeUrl = goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ;
259
259
}
260
260
goog . asserts . dom . assertIsHtmlButtonElement ( button ) . formAction =
261
261
goog . html . SafeUrl . unwrap ( safeUrl ) ;
@@ -287,7 +287,7 @@ goog.dom.safe.setInputFormAction = function(input, url) {
287
287
if ( url instanceof goog . html . SafeUrl ) {
288
288
safeUrl = url ;
289
289
} else {
290
- safeUrl = goog . html . SafeUrl . sanitizeAssertUnchanged ( url ) ;
290
+ safeUrl = goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ;
291
291
}
292
292
goog . asserts . dom . assertIsHtmlInputElement ( input ) . formAction =
293
293
goog . html . SafeUrl . unwrap ( safeUrl ) ;
@@ -346,7 +346,7 @@ goog.dom.safe.setAnchorHref = function(anchor, url) {
346
346
if ( url instanceof goog . html . SafeUrl ) {
347
347
safeUrl = url ;
348
348
} else {
349
- safeUrl = goog . html . SafeUrl . sanitizeAssertUnchanged ( url ) ;
349
+ safeUrl = goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ;
350
350
}
351
351
anchor . href = goog . html . SafeUrl . unwrap ( safeUrl ) ;
352
352
} ;
@@ -373,8 +373,7 @@ goog.dom.safe.setAudioSrc = function(audioElement, url) {
373
373
if ( url instanceof goog . html . SafeUrl ) {
374
374
safeUrl = url ;
375
375
} else {
376
- var allowDataUrl = / ^ d a t a : a u d i o \/ / i. test ( url ) ;
377
- safeUrl = goog . html . SafeUrl . sanitizeAssertUnchanged ( url , allowDataUrl ) ;
376
+ safeUrl = goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ;
378
377
}
379
378
audioElement . src = goog . html . SafeUrl . unwrap ( safeUrl ) ;
380
379
} ;
@@ -400,8 +399,7 @@ goog.dom.safe.setVideoSrc = function(videoElement, url) {
400
399
if ( url instanceof goog . html . SafeUrl ) {
401
400
safeUrl = url ;
402
401
} else {
403
- var allowDataUrl = / ^ d a t a : v i d e o \/ / i. test ( url ) ;
404
- safeUrl = goog . html . SafeUrl . sanitizeAssertUnchanged ( url , allowDataUrl ) ;
402
+ safeUrl = goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ;
405
403
}
406
404
videoElement . src = goog . html . SafeUrl . unwrap ( safeUrl ) ;
407
405
} ;
@@ -539,7 +537,7 @@ goog.dom.safe.setLinkHrefAndRel = function(link, url, rel) {
539
537
} else { // string
540
538
// SafeUrl.sanitize must return legitimate SafeUrl when passed a string.
541
539
link . href = goog . html . SafeUrl . unwrap (
542
- goog . html . SafeUrl . sanitizeAssertUnchanged ( url ) ) ;
540
+ goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ) ;
543
541
}
544
542
} ;
545
543
@@ -657,7 +655,7 @@ goog.dom.safe.setLocationHref = function(loc, url) {
657
655
if ( url instanceof goog . html . SafeUrl ) {
658
656
safeUrl = url ;
659
657
} else {
660
- safeUrl = goog . html . SafeUrl . sanitizeAssertUnchanged ( url ) ;
658
+ safeUrl = goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ;
661
659
}
662
660
loc . href = goog . html . SafeUrl . unwrap ( safeUrl ) ;
663
661
} ;
@@ -692,7 +690,7 @@ goog.dom.safe.assignLocation = function(loc, url) {
692
690
if ( url instanceof goog . html . SafeUrl ) {
693
691
safeUrl = url ;
694
692
} else {
695
- safeUrl = goog . html . SafeUrl . sanitizeAssertUnchanged ( url ) ;
693
+ safeUrl = goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ;
696
694
}
697
695
loc . assign ( goog . html . SafeUrl . unwrap ( safeUrl ) ) ;
698
696
} ;
@@ -724,7 +722,7 @@ goog.dom.safe.replaceLocation = function(loc, url) {
724
722
if ( url instanceof goog . html . SafeUrl ) {
725
723
safeUrl = url ;
726
724
} else {
727
- safeUrl = goog . html . SafeUrl . sanitizeAssertUnchanged ( url ) ;
725
+ safeUrl = goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ;
728
726
}
729
727
loc . replace ( goog . html . SafeUrl . unwrap ( safeUrl ) ) ;
730
728
} ;
@@ -764,7 +762,7 @@ goog.dom.safe.openInWindow = function(url, opt_openerWin, opt_name, opt_specs) {
764
762
if ( url instanceof goog . html . SafeUrl ) {
765
763
safeUrl = url ;
766
764
} else {
767
- safeUrl = goog . html . SafeUrl . sanitizeAssertUnchanged ( url ) ;
765
+ safeUrl = goog . html . SafeUrl . sanitizeJavascriptUrlAssertUnchanged ( url ) ;
768
766
}
769
767
var win = opt_openerWin || goog . global ;
770
768
// If opt_name is undefined, simply passing that in to open() causes IE to
0 commit comments