From 70eadaebb9a742a76c6a38ab542e098306a7c0b8 Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Mon, 16 Apr 2018 00:20:12 +0200 Subject: [PATCH] use tinymce from npm --- composer.json | 4 +- composer.lock | 81 ++++++++++++++++++---------------- ipf/admin/app.php | 2 +- ipf/admin/assets/js/tinymce.js | 49 ++++++++++---------- 4 files changed, 69 insertions(+), 67 deletions(-) diff --git a/composer.json b/composer.json index 516e227..cfd7712 100644 --- a/composer.json +++ b/composer.json @@ -26,9 +26,9 @@ "andy128k/ipf-legacy-template": "dev-master", "bower-asset/jquery-ui": "~1", "bower-asset/jqueryui-timepicker-addon": "dev-master", - "bower-asset/tinymce-dist": "~4.1", "npm-asset/jquery": "~2", - "npm-asset/tablednd": "^1.0@dev" + "npm-asset/tablednd": "^1.0@dev", + "npm-asset/tinymce": "^4.7" }, "require-dev": { "phpunit/phpunit": "4.4.*" diff --git a/composer.lock b/composer.lock index 347b12f..dc663b3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5a4e962b8864d76f208994b0b2791f7b", + "content-hash": "0832ee56c3ffe8771f66bb1d0b23f3a3", "packages": [ { "name": "andy128k/ipf-legacy-template", @@ -287,44 +287,6 @@ }, "time": "2016-04-20T19:26:28+00:00" }, - { - "name": "bower-asset/tinymce-dist", - "version": "4.7.5", - "source": { - "type": "git", - "url": "https://github.com/tinymce/tinymce-dist.git", - "reference": "256a571d890d4e15da618019994f072cd43209bc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/256a571d890d4e15da618019994f072cd43209bc", - "reference": "256a571d890d4e15da618019994f072cd43209bc", - "shasum": "" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-ignore": [ - "readme.md", - "composer.json", - "package.json", - ".npmignore", - "changelog.txt" - ] - }, - "license": [ - "LGPL-2.1" - ], - "description": "Web based JavaScript HTML WYSIWYG editor control.", - "keywords": [ - "editor", - "html", - "javascript", - "richtext", - "tinymce", - "wysiwyg" - ], - "time": "2018-01-22T13:09:23+00:00" - }, { "name": "d11wtq/boris", "version": "dev-master", @@ -963,6 +925,47 @@ ], "time": "2018-01-14T12:59:24+00:00" }, + { + "name": "npm-asset/tinymce", + "version": "4.7.11", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/tinymce/-/tinymce-4.7.11.tgz", + "reference": null, + "shasum": "c0599637cc0bc1d8a9df4812d1288d02d3c8def7" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-bugs": { + "url": "https://github.com/tinymce/tinymce/issues" + }, + "npm-asset-main": "tinymce.js", + "npm-asset-directories": [], + "npm-asset-repository": { + "type": "git", + "url": "git+https://github.com/tinymce/tinymce-dist.git" + } + }, + "license": [ + "LGPL-2.1" + ], + "authors": [ + { + "name": "Ephox Corporation" + } + ], + "description": "Web based JavaScript HTML WYSIWYG editor control.", + "homepage": "https://github.com/tinymce/tinymce-dist#readme", + "keywords": [ + "editor", + "html", + "javascript", + "richtext", + "tinymce", + "wysiwyg" + ], + "time": "2018-04-11T09:35:56+00:00" + }, { "name": "pear/archive_tar", "version": "1.3.16", diff --git a/ipf/admin/app.php b/ipf/admin/app.php index 38d6a13..058bfe8 100644 --- a/ipf/admin/app.php +++ b/ipf/admin/app.php @@ -72,7 +72,7 @@ class IPF_Admin_App extends IPF_Application return array( 'assets/js/admin.js' => 'admin/admin.js', 'assets/js/filebrowser_popup.js' => 'admin/filebrowser_popup.js', - 'tinymce-dist/skins' => 'admin/skins', + 'tinymce/skins' => 'admin/skins', 'assets/css/admin.css' => 'admin/admin.css', 'assets/css/print.css' => 'admin/admin-print.css', diff --git a/ipf/admin/assets/js/tinymce.js b/ipf/admin/assets/js/tinymce.js index f8fe5ab..8ee8cce 100644 --- a/ipf/admin/assets/js/tinymce.js +++ b/ipf/admin/assets/js/tinymce.js @@ -1,25 +1,24 @@ -//= require tinymce-dist/tinymce.min.js -//= require tinymce-dist/themes/modern/theme.min.js -//= require tinymce-dist/plugins/anchor/plugin.min.js -//= require tinymce-dist/plugins/charmap/plugin.min.js -//= require tinymce-dist/plugins/code/plugin.min.js -//= require tinymce-dist/plugins/colorpicker/plugin.min.js -//= require tinymce-dist/plugins/contextmenu/plugin.min.js -//= require tinymce-dist/plugins/fullscreen/plugin.min.js -//= require tinymce-dist/plugins/hr/plugin.min.js -//= require tinymce-dist/plugins/image/plugin.min.js -//= require tinymce-dist/plugins/insertdatetime/plugin.min.js -//= require tinymce-dist/plugins/link/plugin.min.js -//= require tinymce-dist/plugins/lists/plugin.min.js -//= require tinymce-dist/plugins/media/plugin.min.js -//= require tinymce-dist/plugins/nonbreaking/plugin.min.js -//= require tinymce-dist/plugins/paste/plugin.min.js -//= require tinymce-dist/plugins/preview/plugin.min.js -//= require tinymce-dist/plugins/print/plugin.min.js -//= require tinymce-dist/plugins/searchreplace/plugin.min.js -//= require tinymce-dist/plugins/tabfocus/plugin.min.js -//= require tinymce-dist/plugins/table/plugin.min.js -//= require tinymce-dist/plugins/textcolor/plugin.min.js -//= require tinymce-dist/plugins/visualchars/plugin.min.js -//= require tinymce-dist/plugins/wordcount/plugin.min.js - +//= require tinymce/tinymce.min.js +//= require tinymce/themes/modern/theme.min.js +//= require tinymce/plugins/anchor/plugin.min.js +//= require tinymce/plugins/charmap/plugin.min.js +//= require tinymce/plugins/code/plugin.min.js +//= require tinymce/plugins/colorpicker/plugin.min.js +//= require tinymce/plugins/contextmenu/plugin.min.js +//= require tinymce/plugins/fullscreen/plugin.min.js +//= require tinymce/plugins/hr/plugin.min.js +//= require tinymce/plugins/image/plugin.min.js +//= require tinymce/plugins/insertdatetime/plugin.min.js +//= require tinymce/plugins/link/plugin.min.js +//= require tinymce/plugins/lists/plugin.min.js +//= require tinymce/plugins/media/plugin.min.js +//= require tinymce/plugins/nonbreaking/plugin.min.js +//= require tinymce/plugins/paste/plugin.min.js +//= require tinymce/plugins/preview/plugin.min.js +//= require tinymce/plugins/print/plugin.min.js +//= require tinymce/plugins/searchreplace/plugin.min.js +//= require tinymce/plugins/tabfocus/plugin.min.js +//= require tinymce/plugins/table/plugin.min.js +//= require tinymce/plugins/textcolor/plugin.min.js +//= require tinymce/plugins/visualchars/plugin.min.js +//= require tinymce/plugins/wordcount/plugin.min.js -- 2.49.0