Skip to content

Commit c3b0ff0

Browse files
committed
Migrate dependency scripts from bower to npm
1 parent f4b374d commit c3b0ff0

File tree

5 files changed

+28
-24
lines changed

5 files changed

+28
-24
lines changed

build/paths/vendor.js

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,20 @@ var bowerDir = config.bowerDir;
5858
config.npmDir + '/metismenu/dist/metisMenu.js',
5959
config.npmDir + '/nprogress/nprogress.js',
6060
config.npmDir + '/quill/dist/quill.js',
61+
config.npmDir + '/responsive-toolkit/dist/bootstrap-toolkit.js',
62+
config.npmDir + '/sortablejs/Sortable.js',
63+
config.npmDir + '/tether/dist/js/tether.js',
64+
config.npmDir + '/tinycolor2/tinycolor.js',
65+
config.npmDir + '/dropzone/dist/dropzone.js',
66+
config.npmDir + '/jquery-touchswipe/jquery.touchSwipe.js',
67+
config.npmDir + '/jquery.browser/dist/jquery.browser.js',
68+
config.npmDir + '/popper.js/dist/umd/popper.js',
69+
config.npmDir + '/bootstrap/dist/js/bootstrap.js',
70+
config.npmDir + '/raphael/raphael.js',
71+
config.npmDir + '/morris.js/morris.js',
6172
];
6273

63-
var bowerScripts = mainBowerFiles({
64-
filter: [
65-
'**/*.js',
66-
'!**/*.min.js'
67-
],
68-
paths: rootDir
69-
});
70-
71-
bowerScripts.splice(0, npmScripts.length + 2);
72-
73-
var scripts = [].concat(npmScripts, bowerScripts);
74-
75-
console.log(scripts);
76-
77-
exports.scripts = scripts;
74+
exports.scripts = npmScripts;
7875

7976

8077
/***********************************************

package-lock.json

Lines changed: 13 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"opencollective": "^1.0.3",
3232
"popper.js": "^1.12.9",
3333
"quill": "^1.3.5",
34+
"raphael": "^2.2.7",
3435
"responsive-toolkit": "^2.6.3",
3536
"sortablejs": "^1.7.0",
3637
"tether": "^1.4.3",

src/app/_common/editor/editor.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ $(function() {
55
var $editor = $(this).find(".editor");
66
var $toolbar = $(this).find(".toolbar");
77

8-
console.log("toolbar", $toolbar.get(0));
9-
108
var editor = new Quill($editor.get(0), {
119
theme: 'snow',
1210
// modules: {

src/app/items/editor/item-editor.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$(function(){
22

33
// set sortable options
4-
$('.images-container').sortable({
4+
var sortable = new Sortable($('.images-container').get(0), {
55
animation: 150,
66
handle: ".control-btn.move",
77
draggable: ".image-container",
@@ -31,4 +31,4 @@ $(function(){
3131
$(this).parents('.image-container').addClass('main');
3232
})
3333

34-
})
34+
})

0 commit comments

Comments
 (0)