diff --git a/CHANGELOG.md b/CHANGELOG.md index 6147ec6..8832355 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.0.1 (April 18, 2016) + +### Fixed +- Fixed compatibility with mod_rewrite disabled + ## 1.0.0 (April 7, 2016) - Initial release \ No newline at end of file diff --git a/app/components/editor-tinymce.js b/app/components/editor-tinymce.js index f2d5cf5..9e8093d 100644 --- a/app/components/editor-tinymce.js +++ b/app/components/editor-tinymce.js @@ -7,7 +7,7 @@ module.exports = { }, created: function () { - var baseURL = $pagekit.url + '/packages/pagekit/tinymce/app/assets/tinymce', + var baseURL = $tinymce.root_url + '/app/assets/tinymce', vm = this; this.$parent.editor = this; @@ -37,7 +37,7 @@ module.exports = { toolbar: 'undo redo | bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image media | code | fullscreen', - document_base_url: $pagekit.url + '/', + document_base_url: Vue.url.options.root + '/', elements: [this.$parent.$els.editor], diff --git a/composer.json b/composer.json index 2af394f..013f08a 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "pagekit/tinymce", "type": "pagekit-extension", - "version": "1.0.0", + "version": "1.0.1", "title": "TinyMCE", "description": "Replace Pagekit's default editor with TinyMCE.", "license": "MIT", diff --git a/image.jpg b/image.jpg deleted file mode 100644 index 0f00cbf..0000000 Binary files a/image.jpg and /dev/null differ diff --git a/index.php b/index.php index a042e30..f61f78f 100644 --- a/index.php +++ b/index.php @@ -11,6 +11,7 @@ 'view.scripts' => function ($event, $scripts) use ($app) { $scripts->register('tinymce-script', 'tinymce:app/bundle/tinymce.js', ['~editor']); $scripts->register('tinymce-data', sprintf('var $tinymce = %s;', json_encode([ + 'root_url' => $app['url']->getStatic(__DIR__), 'skin_url' => $app['url']->getStatic(__DIR__ . '/app/assets/skin'), 'language_url' => $app['url']('@tinymce/intl', ['locale' => $app->module('system/intl')->getLocale()]), 'content_css' => $app['url']->getStatic($app['theme']->path . '/css/theme.css')