From f84d66a24ffbdba66d8b1d8bc034431e31d8fe8d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 9 Apr 2014 15:23:09 +0200
Subject: [PATCH] Moved SVGSupport call to use OC.Util.SVGSupport()
---
core/js/js.js | 6 +++---
core/js/tests/specs/coreSpec.js | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/js/js.js b/core/js/js.js
index 1cbb9636dbe..f10c7163092 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -295,7 +295,7 @@ var OC={
*/
imagePath:function(app,file){
if(file.indexOf('.')==-1){//if no extension is given, use png or svg depending on browser support
- file+=(SVGSupport())?'.svg':'.png';
+ file+=(OC.Util.hasSVGSupport())?'.svg':'.png';
}
return OC.filePath(app,'img',file);
},
@@ -497,7 +497,7 @@ var OC={
throw e;
});
}
- if(!SVGSupport()) {
+ if(!OC.Util.hasSVGSupport()) {
OC.Util.replaceSVG();
}
}).show();
@@ -874,7 +874,7 @@ function initCore() {
initSessionHeartBeat();
}
- if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
+ if(!OC.Util.hasSVGSupport()){ //replace all svg images with png images for browser that dont support svg
OC.Util.replaceSVG();
}else{
SVGSupport.checkMimeType();
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 89056807788..ccd9f7a1288 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -147,19 +147,19 @@ describe('Core base tests', function() {
});
describe('Images', function() {
it('Generates image path with given extension', function() {
- var svgSupportStub = sinon.stub(window, 'SVGSupport', function() { return true; });
+ var svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport', function() { return true; });
expect(OC.imagePath('core', 'somefile.jpg')).toEqual(OC.webroot + '/core/img/somefile.jpg');
expect(OC.imagePath(TESTAPP, 'somefile.jpg')).toEqual(TESTAPP_ROOT + '/img/somefile.jpg');
svgSupportStub.restore();
});
it('Generates image path with svg extension when svg support exists', function() {
- var svgSupportStub = sinon.stub(window, 'SVGSupport', function() { return true; });
+ var svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport', function() { return true; });
expect(OC.imagePath('core', 'somefile')).toEqual(OC.webroot + '/core/img/somefile.svg');
expect(OC.imagePath(TESTAPP, 'somefile')).toEqual(TESTAPP_ROOT + '/img/somefile.svg');
svgSupportStub.restore();
});
it('Generates image path with png ext when svg support is not available', function() {
- var svgSupportStub = sinon.stub(window, 'SVGSupport', function() { return false; });
+ var svgSupportStub = sinon.stub(OC.Util, 'hasSVGSupport', function() { return false; });
expect(OC.imagePath('core', 'somefile')).toEqual(OC.webroot + '/core/img/somefile.png');
expect(OC.imagePath(TESTAPP, 'somefile')).toEqual(TESTAPP_ROOT + '/img/somefile.png');
svgSupportStub.restore();
--
GitLab