diff --git a/karma-shared.conf.js b/karma-shared.conf.js
index eeff1fa968e1..19963b516c6e 100644
--- a/karma-shared.conf.js
+++ b/karma-shared.conf.js
@@ -45,8 +45,8 @@ module.exports = function(config, specificOptions) {
'SL_Safari': {
base: 'SauceLabs',
browserName: 'safari',
- platform: 'OS X 10.9',
- version: '7'
+ platform: 'OS X 10.10',
+ version: '8'
},
'SL_IE_8': {
base: 'SauceLabs',
diff --git a/protractor-travis-conf.js b/protractor-travis-conf.js
index b0969b1fa3ad..e6d467a2c857 100644
--- a/protractor-travis-conf.js
+++ b/protractor-travis-conf.js
@@ -20,8 +20,8 @@ config.multiCapabilities = [{
'version': '28'
}, {
browserName: 'safari',
- 'platform': 'OS X 10.9',
- 'version': '7',
+ 'platform': 'OS X 10.10',
+ 'version': '8',
'name': 'Angular E2E',
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
'build': process.env.TRAVIS_BUILD_NUMBER
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
index 86353473854b..fabbf9207eda 100755
--- a/scripts/travis/build.sh
+++ b/scripts/travis/build.sh
@@ -9,9 +9,9 @@ if [ $JOB = "ci-checks" ]; then
grunt ci-checks
elif [ $JOB = "unit" ]; then
if [ "$BROWSER_PROVIDER" == "browserstack" ]; then
- BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_8,BS_IE_9,BS_IE_10,BS_IE_11"
+ BROWSERS="BS_Chrome,BS_Firefox,BS_Safari,BS_IE_8,BS_IE_9,BS_IE_10,BS_IE_11"
else
- BROWSERS="SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11"
+ BROWSERS="SL_Chrome,SL_Firefox,SL_Safari,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11"
fi
grunt test:promises-aplus
diff --git a/src/ngSanitize/sanitize.js b/src/ngSanitize/sanitize.js
index 5d7a6325af0c..243fa84507c0 100644
--- a/src/ngSanitize/sanitize.js
+++ b/src/ngSanitize/sanitize.js
@@ -204,7 +204,7 @@ var validElements = angular.extend({},
optionalEndTagElements);
//Attributes that have href and hence need to be sanitized
-var uriAttrs = makeMap("background,cite,href,longdesc,src,usemap");
+var uriAttrs = makeMap("background,cite,href,longdesc,src");
var validAttrs = angular.extend({}, uriAttrs, makeMap(
'abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,'+
'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,'+
diff --git a/test/ngSanitize/sanitizeSpec.js b/test/ngSanitize/sanitizeSpec.js
index bad56167649b..e13e0ed06710 100644
--- a/test/ngSanitize/sanitizeSpec.js
+++ b/test/ngSanitize/sanitizeSpec.js
@@ -174,6 +174,7 @@ describe('HTML', function() {
it('should remove unsafe value', function() {
expectHTML('').toEqual('');
+ expectHTML('
').toEqual('
');
});
it('should handle self closed elements', function() {