From 3eb47e679ba1c7bf8883f58563fa7911f4df3a8e Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Thu, 19 May 2016 07:02:09 +1000 Subject: [PATCH 01/20] Remove custom font After some testing, sans-serif font appears to behave consistently across Windows and Mac --- modules/backend/assets/css/october.css | 3 +-- modules/backend/assets/less/layout/layout.less | 16 +++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 10bac9bec..8af6954e2 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -1,4 +1,4 @@ -@import "../vendor/jcrop/css/jquery.Jcrop.min.css";@import "../../../system/assets/vendor/prettify/prettify.css";@import "../../../system/assets/vendor/prettify/theme-desert.css";@import url(https://fonts.googleapis.com/css?family=Noto+Sans:400,400italic,700,700italic);@-webkit-keyframes showSweetAlert{0%{transform:scale(0.7);-webkit-transform:scale(0.7)} +@import "../vendor/jcrop/css/jquery.Jcrop.min.css";@import "../../../system/assets/vendor/prettify/prettify.css";@import "../../../system/assets/vendor/prettify/theme-desert.css";@-webkit-keyframes showSweetAlert{0%{transform:scale(0.7);-webkit-transform:scale(0.7)} 45%{transform:scale(1.05);-webkit-transform:scale(1.05)} 80%{transform:scale(0.95);-webkit-tranform:scale(0.95)} 100%{transform:scale(1);-webkit-transform:scale(1)} @@ -586,7 +586,6 @@ body.no-select{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:no html,body{height:100%; } body{webkit-font-smoothing:antialiased;font-family:sans-serif;background:#f9f9f9} #layout-canvas{min-height:100%;height:100%} -body{font-family:'Noto Sans',sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} .control-tabs.primary-tabs > ul.nav-tabs,.control-tabs.primary-tabs > div > ul.nav-tabs,.control-tabs.primary-tabs > div > div > ul.nav-tabs{margin-left:-20px;margin-right:-20px} .control-tabs.primary-tabs.tabs-no-inset > ul.nav-tabs,.control-tabs.primary-tabs.tabs-no-inset > div > ul.nav-tabs,.control-tabs.primary-tabs.tabs-no-inset > div > div > ul.nav-tabs{margin-left:0;margin-right:0} .layout{display:table;table-layout:fixed;height:100%;width:100%} diff --git a/modules/backend/assets/less/layout/layout.less b/modules/backend/assets/less/layout/layout.less index bdd3135d4..b35a3aba1 100644 --- a/modules/backend/assets/less/layout/layout.less +++ b/modules/backend/assets/less/layout/layout.less @@ -47,13 +47,15 @@ body { // Font // -@import url(https://fonts.googleapis.com/css?family=Noto+Sans:400,400italic,700,700italic); - -body { - font-family: 'Noto Sans', sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} +// Removed for performance reasons +// +// @import url(https://fonts.googleapis.com/css?family=Noto+Sans:400,400italic,700,700italic); +// +// body { +// font-family: 'Noto Sans', sans-serif; +// -webkit-font-smoothing: antialiased; +// -moz-osx-font-smoothing: grayscale; +// } // // Tabs override for Layout From 4789616190eade9f702cdc232524031d4af5aefb Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sun, 15 May 2016 06:00:58 +1000 Subject: [PATCH 02/20] Initial switch from Redactor to Froala --- modules/backend/formwidgets/RichEditor.php | 9 +- .../richeditor/assets/js/OCTOBER-README.md | 1 - .../formwidgets/richeditor/assets/js/build.js | 9 +- .../assets/js/plugin.definedlinks.js | 47 --- .../richeditor/assets/js/plugin.figure.js | 267 -------------- .../richeditor/assets/js/plugin.fullscreen.js | 129 ------- .../richeditor/assets/js/plugin.pagelinks.js | 52 --- .../richeditor/assets/js/plugin.table.js | 340 ------------------ .../richeditor/assets/js/richeditor.js | 136 ++++--- .../richeditor/assets/less/richeditor.less | 155 ++------ .../richeditor/partials/_richeditor.htm | 8 +- 11 files changed, 110 insertions(+), 1043 deletions(-) delete mode 100644 modules/backend/formwidgets/richeditor/assets/js/OCTOBER-README.md delete mode 100755 modules/backend/formwidgets/richeditor/assets/js/plugin.definedlinks.js delete mode 100644 modules/backend/formwidgets/richeditor/assets/js/plugin.figure.js delete mode 100755 modules/backend/formwidgets/richeditor/assets/js/plugin.fullscreen.js delete mode 100644 modules/backend/formwidgets/richeditor/assets/js/plugin.pagelinks.js delete mode 100755 modules/backend/formwidgets/richeditor/assets/js/plugin.table.js diff --git a/modules/backend/formwidgets/RichEditor.php b/modules/backend/formwidgets/RichEditor.php index 0fa7bcd16..061ee7416 100644 --- a/modules/backend/formwidgets/RichEditor.php +++ b/modules/backend/formwidgets/RichEditor.php @@ -119,10 +119,13 @@ class RichEditor extends FormWidgetBase { $this->addCss('css/richeditor.css', 'core'); $this->addJs('js/build-min.js', 'core'); + $this->addJs('/modules/backend/formwidgets/codeeditor/assets/js/build-min.js', 'core'); - if ($lang = $this->getValidEditorLang()) { - $this->addJs('vendor/redactor/lang/'.$lang.'.js', 'core'); - } +//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + // if ($lang = $this->getValidEditorLang()) { + // $this->addJs('vendor/redactor/lang/'.$lang.'.js', 'core'); + // } +//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! } /** diff --git a/modules/backend/formwidgets/richeditor/assets/js/OCTOBER-README.md b/modules/backend/formwidgets/richeditor/assets/js/OCTOBER-README.md deleted file mode 100644 index e3096b366..000000000 --- a/modules/backend/formwidgets/richeditor/assets/js/OCTOBER-README.md +++ /dev/null @@ -1 +0,0 @@ -There's a hack in plugin.figure.js script. Added method destory(). The figure plugin keeps a reference to the editor and toolba which can't be cleaned up after the Editor is destroyed. Also, the figure plugin binds event handlers that are never unbound. --ab Apr 08 2015 \ No newline at end of file diff --git a/modules/backend/formwidgets/richeditor/assets/js/build.js b/modules/backend/formwidgets/richeditor/assets/js/build.js index 40f4a4a58..134ed0514 100755 --- a/modules/backend/formwidgets/richeditor/assets/js/build.js +++ b/modules/backend/formwidgets/richeditor/assets/js/build.js @@ -7,11 +7,10 @@ * @see build-min.js * -=require ../vendor/redactor/redactor.js -=require plugin.fullscreen.js -=require plugin.figure.js -=require plugin.table.js -=require plugin.pagelinks.js +=require ../vendor/froala/js/froala_editor.min.js +=require ../vendor/froala/js/plugins/fullscreen.min.js +=require ../vendor/froala/js/plugins/code_beautifier.min.js +=require ../vendor/froala_drm/js/plugins/code_view.js =require richeditor.js */ diff --git a/modules/backend/formwidgets/richeditor/assets/js/plugin.definedlinks.js b/modules/backend/formwidgets/richeditor/assets/js/plugin.definedlinks.js deleted file mode 100755 index 911e75af6..000000000 --- a/modules/backend/formwidgets/richeditor/assets/js/plugin.definedlinks.js +++ /dev/null @@ -1,47 +0,0 @@ -if (!RedactorPlugins) var RedactorPlugins = {}; - -(function($) { - - RedactorPlugins.definedlinks = function() { - return { - init: function() { - if (!this.opts.definedLinks) return; - - this.modal.addCallback('link', $.proxy(this.definedlinks.load, this)); - - }, - load: function() { - var $select = $('') - $('#redactor-modal-link-insert').prepend($select) - - this.pagelinks.storage = {}; - - this.$editor.request(this.opts.pageLinksHandler, { - success: $.proxy(function(data) { - - $.each(data.links, $.proxy(function(key, val) { - this.pagelinks.storage[key] = val - $select.append($('