Skip to content
This repository has been archived by the owner on Dec 1, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
malte-christian committed Apr 18, 2016
2 parents 8128871 + b0586f2 commit d2dfd4c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions app/components/editor-tinymce.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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],

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Binary file removed image.jpg
Binary file not shown.
1 change: 1 addition & 0 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit d2dfd4c

Please sign in to comment.