Skip to content

setting loading promise on request (not on load) to avoid duplicate l… #29

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

Merged
merged 3 commits into from
Jun 26, 2019
Merged

setting loading promise on request (not on load) to avoid duplicate l… #29

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
903db14
setting loading promise on request (not on load) to avoid duplicate l…
vgavro Nov 20, 2018
d0b2640
fixes for setting loading promise instead of 1
vgavro Nov 30, 2018
a157f9f
fixed verbose prop async=false (will act as async=true previously); a…
vgavro Nov 30, 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
16 changes: 10 additions & 6 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var Script2 = {
installed: false,
p: Promise.resolve(),
version: '2.0.3', // grunt will overwrite to match package.json
loaded: {}, // keys are the scripts that have been loaded
loaded: {}, // keys are the scripts that is loading or loaded, values are promises
install (Vue, options = {}) {
if (Script2.installed) return
var customAttrs = ['unload']
Expand All @@ -27,13 +27,17 @@ var Script2 = {
s.type = 'text/javascript'
s.appendChild(document.createTextNode(h))
parent.appendChild(s)
this.$emit('load') // any other proper way to do this or emit error?
})
} else {
var opts = _.omitBy(_.pick(this, props), _.isUndefined)
opts.parent = parent
// this syntax results in an implicit return
var load = () => Script2.load(this.src, opts)
_.isUndefined(this.async)
var load = () => Script2.load(this.src, opts).then(
() => this.$emit('load'),
(err) => this.$emit('error', err)
)
!this.async
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The _.isUndefined check was necessary because <script async .. means the same thing as <script async=true. So we must check for both whether it's undefined, and whether async="false" is set, per https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script

? Script2.p = Script2.p.then(load) // serialize execution
: load() // inject immediately
}
Expand All @@ -55,8 +59,7 @@ var Script2 = {
Script2.installed = true
},
load (src, opts = {parent: document.head}) {
return Script2.loaded[src] ? Promise.resolve(src)
: new Promise(function (resolve, reject) {
if (!Script2.loaded[src]) Script2.loaded[src] = new Promise((resolve, reject) => {
var s = document.createElement('script')
// omit the special options that Script2 supports
_.defaults2(s, _.omit(opts, ['unload', 'parent']), {type: 'text/javascript'})
Expand All @@ -73,12 +76,13 @@ var Script2 = {
}
// inspiration from: https://github.com/eldargab/load-script/blob/master/index.js
// and: https://github.com/ded/script.js/blob/master/src/script.js#L70-L82
s.onload = () => { Script2.loaded[src] = 1; resolve(src) }
s.onload = () => resolve(src)
// IE should now support onerror and onload. If necessary, take a look
// at this to add older IE support: http://stackoverflow.com/a/4845802/1781435
s.onerror = () => reject(new Error(src))
opts.parent.appendChild(s)
})
return Script2.loaded[src]
}
}

Expand Down