summaryrefslogtreecommitdiff
path: root/public/js
diff options
context:
space:
mode:
authorLiterallie2017-11-02 17:57:44 +0100
committerLiterallie2017-11-02 17:57:44 +0100
commit3a752fde5117e800d65e26cbe7b15d65eb5b491e (patch)
treeb9ac4041f6d41d70a8fb46dec7a99a353646fe7d /public/js
parent567f26f5b9a5ffa0c28fba789ad502c54c4035a7 (diff)
Revert "Load js-url lib using legacy-loader"
Didn't work in Firefox for some reason. `[Script Loader] ReferenceError: module is not defined` This reverts commit 5b83deb043296c23ff912a2472703c1f7faddb4b.
Diffstat (limited to 'public/js')
-rw-r--r--public/js/history.js6
-rw-r--r--public/js/index.js6
2 files changed, 4 insertions, 8 deletions
diff --git a/public/js/history.js b/public/js/history.js
index da82fd04..e14b80d8 100644
--- a/public/js/history.js
+++ b/public/js/history.js
@@ -12,16 +12,14 @@ import {
urlpath
} from './lib/config'
-var jsUrl = require('js-url')
-
window.migrateHistoryFromTempCallback = null
migrateHistoryFromTemp()
function migrateHistoryFromTemp () {
- if (jsUrl('#tempid')) {
+ if (window.url('#tempid')) {
$.get(`${serverurl}/temp`, {
- tempid: jsUrl('#tempid')
+ tempid: window.url('#tempid')
})
.done(data => {
if (data && data.temp) {
diff --git a/public/js/index.js b/public/js/index.js
index 56522e9c..b336af90 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -21,8 +21,6 @@ import _ from 'lodash'
import List from 'list.js'
-var jsUrl = require('js-url')
-
import {
checkLoginStateChanged,
setloginStateChangeEvent
@@ -1476,12 +1474,12 @@ $('#gistImportModalConfirm').click(function () {
if (!isValidURL(gisturl)) {
showMessageModal('<i class="fa fa-github"></i> Import from Gist', 'Not a valid URL :(', '', '', false)
} else {
- var hostname = jsUrl('hostname', gisturl)
+ var hostname = window.url('hostname', gisturl)
if (hostname !== 'gist.github.com') {
showMessageModal('<i class="fa fa-github"></i> Import from Gist', 'Not a valid Gist URL :(', '', '', false)
} else {
ui.spinner.show()
- $.get('https://api.github.com/gists/' + jsUrl('-1', gisturl))
+ $.get('https://api.github.com/gists/' + window.url('-1', gisturl))
.done(function (data) {
if (data.files) {
var contents = ''