Skip to content
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

Jump to bottom

removed global mode #520

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

removed global mode #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c160971
removed global mode
stevekrouse Feb 12, 2018
54fc6f6
added WOOF_GLOBAL_MODE constant
Feb 23, 2018
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
15 changes: 9 additions & 6 deletions dist/woof.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,11 +1778,10 @@ Woof.prototype.Sound = function () {
low: 0.5,
normal: 1
}
};

// Convert given value to corresponding audio object value
// Throw error if given value not found in allowed values
var soundVolumeToAudioVolume = function soundVolumeToAudioVolume(val) {
// Convert given value to corresponding audio object value
// Throw error if given value not found in allowed values
};var soundVolumeToAudioVolume = function soundVolumeToAudioVolume(val) {
if (typeof val == "number") {
if (val >= 0 && val <= 1) {
return val;
Expand Down Expand Up @@ -2328,8 +2327,12 @@ var getData = function getData(url, callback) {
var currentScript = document.currentScript || Array.prototype.slice.call(document.getElementsByTagName('script')).find(function (s) {
return s.src.includes('woof.js');
});
// the script tag containing Woof has an attribute global="false"
var falseGlobalAttribute = currentScript.getAttribute('global') === 'false';
// WOOF_GLOBAL_MODE = false was set before this script was loaded
var falseConstant = typeof window.WOOF_GLOBAL_MODE !== 'undefined' && window.WOOF_GLOBAL_MODE === false;
var globalMode = !falseGlobalAttribute && !falseConstant;

if (JSON.parse(currentScript.getAttribute('global')) !== false) {
// unless the script tag containing Woof has an attribute global="false", start Woof in global mode
if (globalMode) {
Woof.prototype.extend(window, new Woof({ global: true, fullScreen: true }));
}
8 changes: 6 additions & 2 deletions src/woof.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,8 +1778,12 @@ const getData = (url, callback) => {

// find the woof.js script tag in the page
var currentScript = document.currentScript || Array.prototype.slice.call(document.getElementsByTagName('script')).find(s => s.src.includes('woof.js'))
// the script tag containing Woof has an attribute global="false"
var falseGlobalAttribute = currentScript.getAttribute('global') === 'false'
// WOOF_GLOBAL_MODE = false was set before this script was loaded
var falseConstant = typeof window.WOOF_GLOBAL_MODE !== 'undefined' && window.WOOF_GLOBAL_MODE === false
var globalMode = !falseGlobalAttribute && !falseConstant

if (JSON.parse(currentScript.getAttribute('global')) !== false) {
// unless the script tag containing Woof has an attribute global="false", start Woof in global mode
if (globalMode) {
Woof.prototype.extend(window, new Woof({global: true, fullScreen: true}));
}