1
0
mirror of https://github.com/flarum/core.git synced 2025-07-27 19:50:20 +02:00

Update for composer branch

This commit is contained in:
Toby Zerner
2015-10-13 12:29:22 +10:30
parent d76e27559e
commit d333a60aa4
18 changed files with 244 additions and 153 deletions

View File

@@ -1,3 +0,0 @@
bower_components
node_modules
dist

View File

@@ -1,7 +0,0 @@
var gulp = require('flarum-gulp');
gulp({
modules: {
'embed': 'src/**/*.js'
}
});

View File

@@ -1,7 +0,0 @@
{
"private": true,
"devDependencies": {
"gulp": "^3.8.11",
"flarum-gulp": "^0.1.0"
}
}

View File

@@ -1,5 +0,0 @@
import app from 'flarum/app';
app.initializers.add('embed', () => {
});

View File

@@ -5,6 +5,6 @@ gulp({
'bower_components/iframe-resizer/js/iframeResizer.contentWindow.min.js'
],
modules: {
'embed': 'src/**/*.js'
'flarum/embed': 'src/**/*.js'
}
});

File diff suppressed because one or more lines are too long

View File

@@ -4,7 +4,7 @@ import Composer from 'flarum/components/Composer';
import ModalManager from 'flarum/components/ModalManager';
import AlertManager from 'flarum/components/AlertManager';
import DiscussionPage from 'embed/components/DiscussionPage';
import DiscussionPage from 'flarum/embed/components/DiscussionPage';
app.initializers.add('boot', () => {
override(m, 'route', function(original, root, arg1, arg2, vdom) {