From faa0b6f2ce8411ce6adb3aa4d771bf4750bc2969 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 11 Oct 2015 16:35:01 +1030 Subject: [PATCH] Update for composer branch --- extensions/markdown/.gitignore | 2 + extensions/markdown/bootstrap.php | 7 ++- extensions/markdown/composer.json | 31 ++++++++++++- extensions/markdown/flarum.json | 25 ----------- extensions/markdown/icon.svg | 1 + extensions/markdown/js/.gitignore | 3 -- extensions/markdown/js/forum/Gulpfile.js | 7 --- extensions/markdown/js/forum/package.json | 7 --- extensions/markdown/js/forum/src/main.js | 6 --- extensions/markdown/less/forum/extension.less | 0 extensions/markdown/locale/en.yml | 2 - extensions/markdown/src/Extension.php | 23 ---------- .../FormatMarkdown.php} | 16 ++++--- .../src/Listeners/AddClientAssets.php | 43 ------------------- 14 files changed, 48 insertions(+), 125 deletions(-) delete mode 100644 extensions/markdown/flarum.json create mode 100755 extensions/markdown/icon.svg delete mode 100644 extensions/markdown/js/.gitignore delete mode 100644 extensions/markdown/js/forum/Gulpfile.js delete mode 100644 extensions/markdown/js/forum/package.json delete mode 100644 extensions/markdown/js/forum/src/main.js delete mode 100644 extensions/markdown/less/forum/extension.less delete mode 100644 extensions/markdown/locale/en.yml delete mode 100644 extensions/markdown/src/Extension.php rename extensions/markdown/src/{Listeners/AddMarkdownFormatter.php => Listener/FormatMarkdown.php} (52%) delete mode 100644 extensions/markdown/src/Listeners/AddClientAssets.php diff --git a/extensions/markdown/.gitignore b/extensions/markdown/.gitignore index a4f3b125e..43eeee7fe 100644 --- a/extensions/markdown/.gitignore +++ b/extensions/markdown/.gitignore @@ -2,3 +2,5 @@ composer.phar .DS_Store Thumbs.db +bower_components +node_modules \ No newline at end of file diff --git a/extensions/markdown/bootstrap.php b/extensions/markdown/bootstrap.php index 1600ab373..a734a857b 100644 --- a/extensions/markdown/bootstrap.php +++ b/extensions/markdown/bootstrap.php @@ -9,6 +9,9 @@ * file that was distributed with this source code. */ -require __DIR__.'/vendor/autoload.php'; +use Flarum\Markdown\Listener; +use Illuminate\Contracts\Events\Dispatcher; -return 'Flarum\Markdown\Extension'; +return function (Dispatcher $events) { + $events->subscribe(Listener\FormatMarkdown::class); +}; \ No newline at end of file diff --git a/extensions/markdown/composer.json b/extensions/markdown/composer.json index 91af2e95f..37cad0b4f 100644 --- a/extensions/markdown/composer.json +++ b/extensions/markdown/composer.json @@ -1,10 +1,37 @@ { + "name": "flarum/markdown", + "description": "Allow posts to be formatted with Markdown.", + "type": "flarum-extension", + "license": "MIT", + "authors": [ + { + "name": "Toby Zerner", + "email": "toby.zerner@gmail.com" + } + ], + "support": { + "issues": "https://github.com/flarum/core/issues", + "source": "https://github.com/flarum/markdown" + }, + "require": { + "flarum/core": "^0.1.0-beta.3" + }, "autoload": { "psr-4": { "Flarum\\Markdown\\": "src/" } }, - "scripts": { - "style": "phpcs --standard=PSR2 -np src" + "extra": { + "flarum-extension": { + "title": "Markdown", + "icon": { + "image": "icon.svg", + "backgroundColor": "#000", + "backgroundSize": "100%", + "backgroundRepeat": "no-repeat", + "backgroundPosition": "center", + "color": "#fff" + } + } } } diff --git a/extensions/markdown/flarum.json b/extensions/markdown/flarum.json deleted file mode 100644 index 24b4b5804..000000000 --- a/extensions/markdown/flarum.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "markdown", - "title": "Markdown", - "description": "Allow posts to be formatted with Markdown.", - "keywords": ["discussions"], - "version": "0.1.0-beta.2", - "author": { - "name": "Toby Zerner", - "email": "toby@flarum.org", - "homepage": "http://tobyzerner.com" - }, - "license": "MIT", - "require": { - "flarum": ">=0.1.0-beta.2" - }, - "support": { - "source": "https://github.com/flarum/markdown", - "issues": "https://github.com/flarum/core/issues" - }, - "icon": { - "name": "font", - "backgroundColor": "#AB90D8", - "color": "#fff" - } -} diff --git a/extensions/markdown/icon.svg b/extensions/markdown/icon.svg new file mode 100755 index 000000000..40470265f --- /dev/null +++ b/extensions/markdown/icon.svg @@ -0,0 +1 @@ + diff --git a/extensions/markdown/js/.gitignore b/extensions/markdown/js/.gitignore deleted file mode 100644 index 372e20a51..000000000 --- a/extensions/markdown/js/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -bower_components -node_modules -dist diff --git a/extensions/markdown/js/forum/Gulpfile.js b/extensions/markdown/js/forum/Gulpfile.js deleted file mode 100644 index f37a77a58..000000000 --- a/extensions/markdown/js/forum/Gulpfile.js +++ /dev/null @@ -1,7 +0,0 @@ -var gulp = require('flarum-gulp'); - -gulp({ - modules: { - 'markdown': 'src/**/*.js' - } -}); diff --git a/extensions/markdown/js/forum/package.json b/extensions/markdown/js/forum/package.json deleted file mode 100644 index 62ea6c691..000000000 --- a/extensions/markdown/js/forum/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "private": true, - "devDependencies": { - "gulp": "^3.8.11", - "flarum-gulp": "^0.1.0" - } -} diff --git a/extensions/markdown/js/forum/src/main.js b/extensions/markdown/js/forum/src/main.js deleted file mode 100644 index b92b94b43..000000000 --- a/extensions/markdown/js/forum/src/main.js +++ /dev/null @@ -1,6 +0,0 @@ -import { extend } from 'flarum/extend'; -import app from 'flarum/app'; - -app.initializers.add('markdown', function() { - // TODO -}); diff --git a/extensions/markdown/less/forum/extension.less b/extensions/markdown/less/forum/extension.less deleted file mode 100644 index e69de29bb..000000000 diff --git a/extensions/markdown/locale/en.yml b/extensions/markdown/locale/en.yml deleted file mode 100644 index dbc8ec12e..000000000 --- a/extensions/markdown/locale/en.yml +++ /dev/null @@ -1,2 +0,0 @@ -markdown: - # hello_world: "Hello, world!" diff --git a/extensions/markdown/src/Extension.php b/extensions/markdown/src/Extension.php deleted file mode 100644 index 76b8210d0..000000000 --- a/extensions/markdown/src/Extension.php +++ /dev/null @@ -1,23 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flarum\Markdown; - -use Flarum\Support\Extension as BaseExtension; -use Illuminate\Events\Dispatcher; - -class Extension extends BaseExtension -{ - public function listen(Dispatcher $events) - { - $events->subscribe('Flarum\Markdown\Listeners\AddClientAssets'); - $events->subscribe('Flarum\Markdown\Listeners\AddMarkdownFormatter'); - } -} diff --git a/extensions/markdown/src/Listeners/AddMarkdownFormatter.php b/extensions/markdown/src/Listener/FormatMarkdown.php similarity index 52% rename from extensions/markdown/src/Listeners/AddMarkdownFormatter.php rename to extensions/markdown/src/Listener/FormatMarkdown.php index 6306627f5..5e6e3c9cf 100644 --- a/extensions/markdown/src/Listeners/AddMarkdownFormatter.php +++ b/extensions/markdown/src/Listener/FormatMarkdown.php @@ -8,19 +8,25 @@ * file that was distributed with this source code. */ -namespace Flarum\Markdown\Listeners; +namespace Flarum\Markdown\Listener; -use Flarum\Events\FormatterConfigurator; +use Flarum\Event\ConfigureFormatter; use Illuminate\Contracts\Events\Dispatcher; -class AddMarkdownFormatter +class FormatMarkdown { + /** + * @param Dispatcher $events + */ public function subscribe(Dispatcher $events) { - $events->listen(FormatterConfigurator::class, [$this, 'addMarkdownFormatter']); + $events->listen(ConfigureFormatter::class, [$this, 'addMarkdownFormatter']); } - public function addMarkdownFormatter(FormatterConfigurator $event) + /** + * @param ConfigureFormatter $event + */ + public function addMarkdownFormatter(ConfigureFormatter $event) { $event->configurator->Litedown; } diff --git a/extensions/markdown/src/Listeners/AddClientAssets.php b/extensions/markdown/src/Listeners/AddClientAssets.php deleted file mode 100644 index 7f7db3611..000000000 --- a/extensions/markdown/src/Listeners/AddClientAssets.php +++ /dev/null @@ -1,43 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flarum\Markdown\Listeners; - -use Flarum\Events\RegisterLocales; -use Flarum\Events\BuildClientView; -use Illuminate\Contracts\Events\Dispatcher; - -class AddClientAssets -{ - public function subscribe(Dispatcher $events) - { - $events->listen(RegisterLocales::class, [$this, 'addLocale']); - $events->listen(BuildClientView::class, [$this, 'addAssets']); - } - - public function addLocale(RegisterLocales $event) - { - $event->addTranslations('en', __DIR__.'/../../locale/en.yml'); - } - - public function addAssets(BuildClientView $event) - { - $event->forumAssets([ - __DIR__.'/../../js/forum/dist/extension.js', - __DIR__.'/../../less/forum/extension.less' - ]); - - $event->forumBootstrapper('markdown/main'); - - $event->forumTranslations([ - // 'markdown.hello_world' - ]); - } -}