From 89d9f7a6ed6672234bd6da70227ec30a53c7682e Mon Sep 17 00:00:00 2001 From: Dario Milicic Date: Fri, 8 Aug 2014 15:42:40 +0200 Subject: [PATCH] File upload plugin implemented as a toolbar command and added some multilanguage support. Completely removed the old FCKeditor from the source code. --- scripts/ckeditor-config.js | 2 +- scripts/ckeditor/plugins/abbr/dialogs/abbr.js | 83 ---------- scripts/ckeditor/plugins/abbr/icons/abbr.png | Bin 622 -> 0 bytes .../plugins/fileupload/dialogs/fileupload.js | 132 +++++++++++++++ .../plugins/fileupload/icons/fileupload.png | Bin 0 -> 620 bytes .../plugins/{abbr => fileupload}/plugin.js | 14 +- scripts/fckeditor.zip | Bin 716770 -> 0 bytes .../editor/plugins/elog/fckplugin.js | 151 ------------------ .../editor/plugins/elog/inserttime.gif | Bin 1051 -> 0 bytes scripts/fckeditor/fckelog.js | 52 ------ scripts/load-ckeditor.js | 4 +- src/elogd.c | 4 - src/git-revision.h | 2 +- .../UserInterfaceState.xcuserstate | Bin 34609 -> 34689 bytes .../xcdebugger/Breakpoints_v2.xcbkptlist | 12 +- 15 files changed, 149 insertions(+), 307 deletions(-) delete mode 100644 scripts/ckeditor/plugins/abbr/dialogs/abbr.js delete mode 100644 scripts/ckeditor/plugins/abbr/icons/abbr.png create mode 100644 scripts/ckeditor/plugins/fileupload/dialogs/fileupload.js create mode 100644 scripts/ckeditor/plugins/fileupload/icons/fileupload.png rename scripts/ckeditor/plugins/{abbr => fileupload}/plugin.js (67%) delete mode 100644 scripts/fckeditor.zip delete mode 100644 scripts/fckeditor/editor/plugins/elog/fckplugin.js delete mode 100644 scripts/fckeditor/editor/plugins/elog/inserttime.gif delete mode 100644 scripts/fckeditor/fckelog.js diff --git a/scripts/ckeditor-config.js b/scripts/ckeditor-config.js index 288377de..6ab242ec 100755 --- a/scripts/ckeditor-config.js +++ b/scripts/ckeditor-config.js @@ -7,5 +7,5 @@ CKEDITOR.editorConfig = function( config ) { // Define changes to default configuration here. For example: // config.language = 'fr'; // config.uiColor = '#AADC6E'; - config.extraPlugins = 'abbr,timestamp,dndfiles,eqneditor'; + config.extraPlugins = 'timestamp,dndfiles,eqneditor,fileupload'; }; diff --git a/scripts/ckeditor/plugins/abbr/dialogs/abbr.js b/scripts/ckeditor/plugins/abbr/dialogs/abbr.js deleted file mode 100644 index cfb9d18a..00000000 --- a/scripts/ckeditor/plugins/abbr/dialogs/abbr.js +++ /dev/null @@ -1,83 +0,0 @@ -/** - * The abbr dialog definition. - * - * Created out of the CKEditor Plugin SDK: - * http://docs.ckeditor.com/#!/guide/plugin_sdk_sample_1 - */ - -// Our dialog definition. -CKEDITOR.dialog.add( 'abbrDialog', function( editor ) { - return { - - // Basic properties of the dialog window: title, minimum size. - title: 'Abbreviation Properties', - minWidth: 400, - minHeight: 200, - - // Dialog window contents definition. - contents: [ - { - // Definition of the Basic Settings dialog tab (page). - id: 'tab-basic', - label: 'Basic Settings', - - // The tab contents. - elements: [ - { - // Text input field for the abbreviation text. - type: 'text', - id: 'abbr', - label: 'Abbreviation', - - // Validation checking whether the field is not empty. - validate: CKEDITOR.dialog.validate.notEmpty( "Abbreviation field cannot be empty" ) - }, - { - // Text input field for the abbreviation title (explanation). - type: 'text', - id: 'title', - label: 'Explanation', - validate: CKEDITOR.dialog.validate.notEmpty( "Explanation field cannot be empty" ) - } - ] - }, - - // Definition of the Advanced Settings dialog tab (page). - { - id: 'tab-adv', - label: 'Advanced Settings', - elements: [ - { - // Another text field for the abbr element id. - type: 'text', - id: 'id', - label: 'Id' - } - ] - } - ], - - // This method is invoked once a user clicks the OK button, confirming the dialog. - onOk: function() { - - // The context of this function is the dialog object itself. - // http://docs.ckeditor.com/#!/api/CKEDITOR.dialog - var dialog = this; - - // Creates a new element. - var abbr = editor.document.createElement( 'abbr' ); - - // Set element attribute and text, by getting the defined field values. - abbr.setAttribute( 'title', dialog.getValueOf( 'tab-basic', 'title' ) ); - abbr.setText( dialog.getValueOf( 'tab-basic', 'abbr' ) ); - - // Now get yet another field value, from the advanced tab. - var id = dialog.getValueOf( 'tab-adv', 'id' ); - if ( id ) - abbr.setAttribute( 'id', id ); - - // Finally, inserts the element at the editor caret position. - editor.insertElement( abbr ); - } - }; -}); \ No newline at end of file diff --git a/scripts/ckeditor/plugins/abbr/icons/abbr.png b/scripts/ckeditor/plugins/abbr/icons/abbr.png deleted file mode 100644 index 7d863f949741ff83fd8373a77c0d95a3d95e441f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmV-!0+IcRP)YeaZ-G+53gSTz{SPWVdFiPaPX+$~@n)fi9>qgJ zh4fN-QcEhq^wI<|vImjml9)pF*W2zl+qWbTPaSyKyqWKt`DS)j3xa?yVgf%ewhl|m zA$_0x^Rx4E@d&=>uRoSN*Cm&aL#`7&zr0;L(pKMn1G#$ZszFkMC^?B8f`0w&-UD$u zd-(?iK6#!;xZ`>J^A9DGiTfguewDOKwDEKoL}`ZE_M}0=xvsgf$usmJeV$oo28d0#yu!pdgpag$giC zhlKP!CMX3wsPMGgZ5n>Xg+hV--ENofAcH61#0B7Hvl-7Il}g2A6;lfG`FxbX8A>p$ z0P;GW4il9Mr9jO9)xB^Rgy%*CSTdQ6D;kDDnM{U{5Q21FA4#ZM71$_Dba8z<-Y_Na zS@|v#c0PZNDux9AoXD-ZoWP~q)7QrC`G