Skip to content
This repository has been archived by the owner on Apr 4, 2023. It is now read-only.

Fix GH-103: Create SWF regardless of platform #107

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions index.html
Expand Up @@ -689,6 +689,7 @@ <h2>Open an Extension Project</h2>
ga('send', 'pageview', 'home');
</script>
<script type="text/javascript" src="libs/base64ab.js" async></script>
<script type="text/javascript" src="libs/bowser.min.js"></script>
<script type="text/javascript" src="libs/swfobject.js"></script>
<script type="text/javascript" src="libs/jquery-1.11.2.min.js"></script>
<script type="text/javascript" src="libs/socket.io-1.3.7.js"></script>
Expand Down
29 changes: 25 additions & 4 deletions js/scratchx.js
Expand Up @@ -109,14 +109,35 @@ var params = {
};

$.each(flashVars, function (prop, val) {
if ($.isPlainObject(val))
flashVars[prop] = encodeURIComponent(JSON.stringify(val));
if ($.isPlainObject(val)) {
val = encodeURIComponent(JSON.stringify(val));
}
if (typeof params.flashvars !== 'undefined') {
params.flashvars += '&' + prop + '=' + val;
} else {
params.flashvars = prop + '=' + val;
}
});

swfobject.switchOffAutoHideShow();

swfobject.embedSWF('Scratch.swf', 'scratch', '100%', '100%', '11.7.0', 'libs/expressInstall.swf',
flashVars, params, null, handleEmbedStatus);
var swfAttributes = {
data: 'Scratch.swf',
width: '100%',
height: '100%'
};

swfobject.addDomLoadEvent(function() {
// check if mobile/tablet browser user bowser
if(bowser.mobile || bowser.tablet) {
// if on mobile, show error screen
handleEmbedStatus({success: false});
} else {
// if not on ie, let browser try to handle flash loading
var swf = swfobject.createSWF(swfAttributes, params, "scratch");
handleEmbedStatus({success: true, ref: swf});
}
});


/* File uploads */
Expand Down
6 changes: 6 additions & 0 deletions libs/bowser.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.