summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorLiterallie2017-10-19 22:48:13 +0200
committerLiterallie2017-10-22 00:03:45 +0200
commit5b83deb043296c23ff912a2472703c1f7faddb4b (patch)
treee7380baab9969ae17ee63a2d6a3ef68dd285ac67 /public
parent996cb379912d5ee7b6e26f3c688ce447b4762bc4 (diff)
Load js-url lib using legacy-loader
Doesn't use eval, plus no window object access
Diffstat (limited to '')
-rw-r--r--public/js/history.js6
-rw-r--r--public/js/index.js7
2 files changed, 9 insertions, 4 deletions
diff --git a/public/js/history.js b/public/js/history.js
index e14b80d8..da82fd04 100644
--- a/public/js/history.js
+++ b/public/js/history.js
@@ -12,14 +12,16 @@ import {
urlpath
} from './lib/config'
+var jsUrl = require('js-url')
+
window.migrateHistoryFromTempCallback = null
migrateHistoryFromTemp()
function migrateHistoryFromTemp () {
- if (window.url('#tempid')) {
+ if (jsUrl('#tempid')) {
$.get(`${serverurl}/temp`, {
- tempid: window.url('#tempid')
+ tempid: jsUrl('#tempid')
})
.done(data => {
if (data && data.temp) {
diff --git a/public/js/index.js b/public/js/index.js
index b336af90..25bd1c36 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -3,6 +3,7 @@
modeType, Idle, serverurl, key, gapi, Dropbox, FilePicker
ot, MediaUploader, hex2rgb, num_loaded, Visibility */
+
require('../vendor/showup/showup')
require('../css/index.css')
@@ -21,6 +22,8 @@ import _ from 'lodash'
import List from 'list.js'
+var jsUrl = require('js-url')
+
import {
checkLoginStateChanged,
setloginStateChangeEvent
@@ -1474,12 +1477,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 = window.url('hostname', gisturl)
+ var hostname = jsUrl('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/' + window.url('-1', gisturl))
+ $.get('https://api.github.com/gists/' + jsUrl('-1', gisturl))
.done(function (data) {
if (data.files) {
var contents = ''