diff options
| author | John McLear <john@mclear.co.uk> | 2015-06-17 18:16:18 +0100 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2015-06-17 18:16:18 +0100 |
| commit | 8af8c37896056e9b61080144cf4de683897e169e (patch) | |
| tree | d5ed16c921d70e5f23e749eb8abda32c799d6fd8 | |
| parent | a0aa9470a383e5361e544a9ba76fad06f69fd628 (diff) | |
| parent | 32ba48835a753b3c7f85ec7db1318fcd91fd1484 (diff) | |
| download | etherpad-lite-8af8c37896056e9b61080144cf4de683897e169e.zip | |
Merge pull request #2695 from goldquest/dev_overallImportBug
On Import, when successful, loading circle didn't go away
| -rw-r--r-- | src/static/js/pad.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/static/js/pad.js b/src/static/js/pad.js index e820b76f..6ee39b6b 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -467,7 +467,7 @@ var pad = { { var newHref = new RegExp(/.*\/p\/[^\/]+/).exec(document.location.pathname) || clientVars.padId; newHref = newHref[0]; - if (options != null){ + if (typeof options != "undefined" && options != null){ newHref = newHref + '?' + options; } |