Skip to content

Fixed issue where urls were showing encoded html entities #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed issue where urls were showing encoded html entities #3

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c0c2d1
Fullscreen iFrame on course presentation
Nov 27, 2015
d317954
Added html entity decoding for urls
Nov 27, 2015
5722dea
Merge branch 'modifications'
Nov 27, 2015
3fc35ae
Removed modification work, just patched in html entity decoding.
Nov 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions iframe-embed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ H5P.IFrameEmbed = function (options, contentId) {

if (options.source !== undefined) {
if (options.source.trim().toLowerCase().substring(0, 4) === 'http') {
iFrameSource = options.source;
iFrameSource = decode_entities(options.source);
}
else {
iFrameSource = H5P.getContentPath(contentId) + '/' + options.source;
Expand Down Expand Up @@ -54,9 +54,7 @@ H5P.IFrameEmbed = function (options, contentId) {
};

this.resize = function () {
// Set size of 'iframe' on startup, and when the browser
// is resized, or enters fullscreen.
if(options.resizeSupported) {
if(options.resizeSupported) {
$iframe.css(
(H5P.isFullscreen) ? {width: '100%', height: '100%'} : getElementSize($iframe)
);
Expand All @@ -79,6 +77,29 @@ H5P.IFrameEmbed = function (options, contentId) {
};
};

var decode_entities = (function() {
// Remove HTML Entities
var element = document.createElement('div');

function decode_HTML_entities (str) {
if (str && typeof str === 'string') {
// Escape HTML before decoding for HTML Entities
str = escape(str).replace(/%26/g,'&').replace(/%23/g,'#').replace(/%3B/g,';');
element.innerHTML = str;
if (element.innerText) {
str = element.innerText;
element.innerText = '';
} else {
// Firefox support
str = element.textContent;
element.textContent = '';
}
}
return unescape(str);
}
return decode_HTML_entities;
})();

// This is a fix/hack to make touch work in iframe on mobile safari,
// like if the iframe is listening to touch events on the iframe's
// window object. (like in PHET simulations)
Expand Down