summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-01-14 01:16:30 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-01-14 01:16:30 +0900
commit73630140817ebcfb6b9b350d2b536d315122e48c (patch)
tree0d741aa39f20408fb59cb046758c30e5d97e4018 /src
parentClean up (diff)
downloadmisskey-73630140817ebcfb6b9b350d2b536d315122e48c.tar.gz
misskey-73630140817ebcfb6b9b350d2b536d315122e48c.tar.bz2
misskey-73630140817ebcfb6b9b350d2b536d315122e48c.zip
Clean up
Diffstat (limited to 'src')
-rw-r--r--src/web/app/boot.js4
-rw-r--r--src/web/app/common/mixins.ls6
-rw-r--r--src/web/app/common/scripts/loading.ls2
-rw-r--r--src/web/app/desktop/mixins.ls2
-rw-r--r--src/web/app/desktop/scripts/autocomplete.ls2
-rw-r--r--src/web/app/desktop/scripts/fuck-ad-block.ls2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/web/app/boot.js b/src/web/app/boot.js
index e8e504c2bb..5f4dc79af8 100644
--- a/src/web/app/boot.js
+++ b/src/web/app/boot.js
@@ -3,7 +3,7 @@
*/
const riot = require('riot');
-require('velocity');
+require('velocity-animate');
const api = require('./common/scripts/api.ls');
const signout = require('./common/scripts/signout.ls');
const generateDefaultUserdata = require('./common/scripts/generate-default-userdata.ls');
@@ -18,7 +18,7 @@ require('./common/tags.ls');
document.domain = CONFIG.host;
// ↓ iOS待ちPolyfill (SEE: http://caniuse.com/#feat=fetch)
-require('fetch');
+require('whatwg-fetch');
// ↓ NodeList、HTMLCollectionで forEach を使えるようにする
if (NodeList.prototype.forEach === undefined) {
diff --git a/src/web/app/common/mixins.ls b/src/web/app/common/mixins.ls
index 1320cacd1e..50918c68c4 100644
--- a/src/web/app/common/mixins.ls
+++ b/src/web/app/common/mixins.ls
@@ -9,7 +9,7 @@ module.exports = (me) ~>
api: (require './scripts/api.ls').bind null i
riot.mixin \cropper do
- Cropper: require \cropper
+ Cropper: require \cropperjs
riot.mixin \signout do
signout: require './scripts/signout.ls'
@@ -27,11 +27,11 @@ module.exports = (me) ~>
date-stringify: require './scripts/date-stringify.ls'
riot.mixin \text do
- analyze: require 'misskey-text'
+ analyze: require '../../../common/text/index.js'
compile: require './scripts/text-compiler.js'
riot.mixin \get-password-strength do
- get-password-strength: require 'strength.js'
+ get-password-strength: require 'syuilo-password-strength'
riot.mixin \ui-progress do
Progress: require './scripts/loading.ls'
diff --git a/src/web/app/common/scripts/loading.ls b/src/web/app/common/scripts/loading.ls
index ed791b21ac..8ebede6db4 100644
--- a/src/web/app/common/scripts/loading.ls
+++ b/src/web/app/common/scripts/loading.ls
@@ -1,4 +1,4 @@
-NProgress = require 'NProgress'
+NProgress = require \nprogress
NProgress.configure do
trickle-speed: 500ms
show-spinner: false
diff --git a/src/web/app/desktop/mixins.ls b/src/web/app/desktop/mixins.ls
index debd89fbd4..0bafe8098f 100644
--- a/src/web/app/desktop/mixins.ls
+++ b/src/web/app/desktop/mixins.ls
@@ -2,7 +2,7 @@ riot = require \riot
module.exports = (me) ~>
riot.mixin \sortable do
- Sortable: require \Sortable
+ Sortable: require \sortablejs
if me?
(require './scripts/stream.ls') me
diff --git a/src/web/app/desktop/scripts/autocomplete.ls b/src/web/app/desktop/scripts/autocomplete.ls
index 636bb7f277..391fb312e3 100644
--- a/src/web/app/desktop/scripts/autocomplete.ls
+++ b/src/web/app/desktop/scripts/autocomplete.ls
@@ -1,7 +1,7 @@
# Autocomplete
#================================
-get-caret-coordinates = require 'textarea-caret-position'
+get-caret-coordinates = require 'textarea-caret'
riot = require 'riot'
# オートコンプリートを管理するクラスです。
diff --git a/src/web/app/desktop/scripts/fuck-ad-block.ls b/src/web/app/desktop/scripts/fuck-ad-block.ls
index 55431fcd00..7990f58f1f 100644
--- a/src/web/app/desktop/scripts/fuck-ad-block.ls
+++ b/src/web/app/desktop/scripts/fuck-ad-block.ls
@@ -1,7 +1,7 @@
# FUCK AD BLOCK
#================================
-require 'fuck-adblock'
+require \fuckadblock
dialog = require './dialog.ls'
module.exports = ~>