Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #20793 from edx/zaid-prod-250

Browse Source 
Fixed CDN urls to Static urls on edit.
This commit is contained in:
Muhammad Zaid Bamber
2019-07-18 18:53:59 +05:00
committed by GitHub
parent af50c3c043 d3b1fd24f7
commit cc985a407b
3 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cms/static/js/views/course_info_helper.js
View File

@@ -2,6 +2,7 @@ define(['codemirror', 'js/utils/handle_iframe_binding', 'utility'],
function(CodeMirror, IframeBinding) {
var editWithCodeMirror = function(model, contentName, baseAssetUrl, textArea) {
var content = rewriteStaticLinks(model.get(contentName), baseAssetUrl, '/static/');
content = rewriteCdnLinksToStatic(content); // eslint-disable-line no-undef
model.set(contentName, content);
var $codeMirror = CodeMirror.fromTextArea(textArea, {
mode: 'text/html',

22
common/static/js/spec/utility_spec.js
View File

@@ -16,3 +16,25 @@ describe('utility.rewriteStaticLinks', function() {
).toBe('<img src="http://www.mysite.org/static/foo.x"/>');
});
});
describe('utility.rewriteCdnLinksToStatic', function() {
'use strict';
it('does not replace "url" to "static url" if url is not following "cdn url" pattern', function() {
expect(
rewriteCdnLinksToStatic( // eslint-disable-line no-undef
'<img src="/asset-v1:UCentralLah+Cs201+2019_1+type@asset+block/foo.x"/>')
).toBe('<img src="/asset-v1:UCentralLah+Cs201+2019_1+type@asset+block/foo.x"/>');
expect(
rewriteCdnLinksToStatic('<img src="/assets/foo.x"/>') // eslint-disable-line no-undef
).toBe('<img src="/assets/foo.x"/>');
});
it('does a replace of "cdn url" to "static url" if url is part of absolute url', function() {
expect(
rewriteCdnLinksToStatic( // eslint-disable-line no-undef
'<img src="//prod-edxapp.edx-cdn.org/assets/foo.x"/>')
).toBe('<img src="/static/foo.x"/>');
expect(
rewriteCdnLinksToStatic( // eslint-disable-line no-undef
'<img src="https://prod-edxapp.edx-cdn.org/assets/foo.x"/>')
).toBe('<img src="/static/foo.x"/>');
});
});

8
common/static/js/src/utility.js
View File

@@ -35,5 +35,13 @@ window.rewriteStaticLinks = function(content, from, to) {
// escape all regex interpretable chars
fromRe = from.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
var regex = new RegExp('(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}([-a-zA-Z0-9@:%_\+.~#?&//=]*))?' + fromRe, 'g');
return content.replace(regex, replacer);
};
// Utility method for replacing absolute URLs
window.rewriteCdnLinksToStatic = function(content) {
'use strict';
var regex = new RegExp('((https?:)?[/][/](www.)?[-a-zA-Z0-9@:%._+~#=]{2,256}[a-z]{2,6}([-a-zA-Z0-9@:%_+~#?&//=]*)|[a-z-]{14})[/]', 'g');// eslint-disable-line max-len
return content.replace(regex, '/static/');
};