Просмотр исходного кода

修复版式文件表格resize问题

huqi 5 лет назад
Родитель
Сommit
77c39e1623

+ 0 - 3
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/quicktable/.gitignore

@@ -1,3 +0,0 @@
-node_modules
-release
-*.log

+ 0 - 30
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/quicktable/.jshintrc

@@ -1,30 +0,0 @@
-{
-    "asi":           false,
-    "browser":       true,
-    "curly":		 true,
-    "debug":         false,
-    "devel":         true,
-    "eqeqeq":        false, 
-    "es3":        	 true, 
-    "evil":          true,
-	"expr":			 true,
-    "maxparams":     5,
-    "maxdepth":      3,
-    "maxstatements": 20,
-    "maxcomplexity": 12,
-    "proto":         true,
-    "regexdash":     true,
-    "strict":        false,
-	"scripturl":     true,
-    "sub":           true,
-    "trailing":      true,
-    "undef":         true,
-
-    "predef" : [
-        "exports",
-        "phantom",
-        "window",
-        "require",
-		"CKEDITOR"
-    ]
-}

+ 0 - 8
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/quicktable/.travis.yml

@@ -1,8 +0,0 @@
-language: node_js
-node_js:
-  - 0.11
-before_script:
-  - npm install -g grunt-cli
-cache:
-  directories:
-    - node_modules

+ 0 - 38
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/quicktable/CHANGELOG.md

@@ -1,38 +0,0 @@
-Quicktable plugin for ckeditor 4.x
-==========
-###Version 1.0.5
-- If the border gets disabled (`config.qtBorder = 0`) it isn't necessary to set the qtClass to `cke_show_border` anymore
-	- Event `removeFormatCleanup` is fired if table gets inserted into the editor
-- Small changes to the preview table design (no table border, cellspacing and cellpadding of 1)
-- Adding option for preview table cell border
-- Adding option for preview table cell background on hover
-- Adding option for preview table cell size
-
-###Version 1.0.4
-- fix refactoring errors (table dimensions didn't get updated anymore)
-	```javascript
-	Cannot read property 'setText' of undefined
-	```
-	```javascript
-	Cannot read property '$' of undefined 
-	```
-
-###Version 1.0.3
-- short option values *(older ones are not supported anymore)*
-- modify compiled sample so it refers to local ckeditor
-- updated configuration sample
-- example includes 2 editors (default and custom configuration)
-- code refactoring to decrease code complexity and count of statements
-
-###Version 1.0.2
-- Adding cellspacing option
-- Adding cellpadding option
-- Change default width to table plugin default width
-
-###Version 1.0.1
-- change the sample to use ckeditor cdn
-- adding a new class option to set the table attribute class
-- change the style option type from string to object (for easier configuration)
-
-###Version 1.0.0
-- Initial Release

+ 0 - 123
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/quicktable/Gruntfile.js

@@ -1,123 +0,0 @@
-/* jshint node: true */
-var fs = require('fs');
-
-module.exports = function (grunt) {
-	"use strict";
-
-	grunt.initConfig({
-		pkg: grunt.file.readJSON('package.json'), 
-		jshint: {
-			all: [
-				"lang/*.js", 
-				"*.js",
-				"*.json"
-			], 
-			options: {
-				jshintrc: '.jshintrc'
-			}
-		},
-		lint5: {
-			dirPath: "samples",
-			templates: [
-				"quicktable.html"
-			]
-			//,
-			// ignoreList: [
-			// ]
-		},
-		compress: {
-			main: {
-				options: {
-					archive: 'release/<%= pkg.name %>-<%= pkg.version %>.zip',
-					level: 9,
-					pretty: true
-				},
-				files: [
-					{
-						src: [
-							'**', 
-							// Exclude files and folders
-							'!node_modules/**',
-							'!release/**',
-							'!.*',
-							'!*.log',
-							'!Gruntfile.js',
-							'!package.json',
-							'!LICENSE',
-							'!*.md',
-							'!template.jst',
-							'!*.zip'
-						], 
-						dest: '<%= pkg.name %>/'
-					}
-				]
-			}
-		},
-		markdown: {
-			all: {
-				files: [
-					{
-						expand: true,
-						src: '*.md',
-						dest: 'release/docs/',
-						ext: '.html'
-					}
-				],
-				options: {
-					template: 'template.jst',
-					//preCompile: function(src, context) {},
-					//postCompile: function(src, context) {},
-					//templateContext: {},
-					markdownOptions: {
-						gfm: true,
-						highlight: 'manual'
-					}
-				}
-			}
-		}
-	});
-
-	function replaceContent(file, searchArray) {
-		fs.readFile(file, 'utf8', function (err,data) {
-			if (err) {
-				return grunt.log.writeln(err);
-			}
-			
-			var result = data;
-			for (var i = 0; i < searchArray.length;i++){
-				result = result.replace(searchArray[i][0], searchArray[i][1]);
-			}
-			fs.writeFile(file, result, 'utf8', function (err) {
-				if (err) {
-					return grunt.log.writeln(err);
-				}
-			});
-		});
-	}
-	
-	grunt.loadNpmTasks('grunt-markdown');
-	grunt.loadNpmTasks('grunt-contrib-compress');
-	grunt.loadNpmTasks('grunt-lint5');
-	grunt.loadNpmTasks('grunt-contrib-jshint');
-
-	grunt.registerTask('test', ['jshint', 'lint5']);
-	grunt.registerTask('build-only', ['beforeCompress', 'compress', 'afterCompress']);
-	grunt.registerTask('build', ['test', 'beforeCompress', 'compress', 'afterCompress', 'markdown']);
-	grunt.registerTask('default', ['test']);
-	//Custom tasks
-	grunt.registerTask('beforeCompress', 'Running before Compression', function() {
-		replaceContent('samples/quicktable.html', [ 
-			[/http\:\/\/cdn.ckeditor.com\/4.4.3\/full-all\//g, '../../../'],
-			[/language: 'en'/g, '// language: \'en\''],
-			[/<!-- REMOVE BEGIN -->/g, '<!-- REMOVE BEGIN --><!--']
-		]);
-	});
-	grunt.registerTask('afterCompress', 'Running after Compression', function() {
-		replaceContent('samples/quicktable.html', [
-			[/\.\.\/\.\.\/\.\.\//g, 'http://cdn.ckeditor.com/4.4.3/full-all/'],
-			[/\/\/ language: 'en'/g, 'language: \'en\''],
-			[/<!-- REMOVE BEGIN --><!--/g, '<!-- REMOVE BEGIN -->']
-		]);
-	});
-	
-};

+ 0 - 339
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/quicktable/LICENSE

@@ -1,339 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {description}
-    Copyright (C) {year}  {fullname}
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  {signature of Ty Coon}, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

+ 0 - 52
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/quicktable/README.md

@@ -1,52 +0,0 @@
-quicktable
-==========
-[![Build Status](https://travis-ci.org/ufdada/quicktable.svg?branch=master)](https://travis-ci.org/ufdada/quicktable)
-[![devDependency Status](https://david-dm.org/ufdada/quicktable/dev-status.svg)](https://david-dm.org/ufdada/quicktable#info=devDependencies)
-###A quicktable plugin for ckeditor 4
-
-This plugin adds a quicktable feature to the existing table plugin.
-
-The original code was submitted by [danyaPostfactum](https://github.com/danyaPostfactum) as a pull request for the table plugin. 
-I just extracted the code and made a seperate plugin out of it and added some options to it (see sample in plugin directory)
-
-__*The original table plugin is required for this to work!*__
-
-####Building:
-This requires **node.js** and **npm** to be installed.
-
-Then open the directory with the *git-shell* and type `npm install` to install the required packages.
-
-After that you can execute grunt with the following options:
-
-1. `grunt test`
- - Linting the js and html files (check for syntax errors etc.). See [JS Hint Configuration File](https://raw.githubusercontent.com/ufdada/quicktable/master/.jshintrc) for options __*(default)*__
-2. `grunt build`
- - `grunt test` and compressing the plugin into a zip file. The zip file is located in the *release* directory.
-3. `grunt build-only`
- - Just generating the zip file without linting and markdown compile *(not recommended)*
-
-####Installation:
-Just copy the whole directory (quicktable) in the plugins directory
-
-####Configuration:
-
-```javascript
-	CKEDITOR.replace( 'editor1', {
-		qtRows: 20, // Count of rows in the quicktable (default: 8)
-		qtColumns: 20, // Count of columns in the quicktable (default: 10)
-		qtBorder: '1', // Border of the inserted table (default: '1')
-		qtWidth: '90%', // Width of the inserted table (default: '500px')
-		qtStyle: { 'border-collapse' : 'collapse' }, // Content of the style-attribute of the inserted table (default: null)
-		qtClass: 'test', // Class of the inserted table (default: '')
-		qtCellPadding: '0', // Cell padding of the inserted table (default: '1')
-		qtCellSpacing: '0', // Cell spacing of the inserted table (default: '1')
-		qtPreviewBorder: '4px double black', // Border of the preview table (default: '1px solid #aaa')
-		qtPreviewSize: '4px', // Cell size of the preview table (default: '14px')
-		qtPreviewBackground: '#c8def4' // Cell background of the preview table on hover (default: '#e5e5e5')
-	});
-```
-
-####Known Issues:
-- Some missing translations
-
-For more Information see original post [here](https://github.com/ckeditor/ckeditor-dev/pull/92)

+ 0 - 31
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/quicktable/package.json

@@ -1,31 +0,0 @@
-{
-  "name": "quicktable",
-  "description": "A quicktable plugin for ckeditor 4",
-  "version": "1.0.5",
-  "keywords": [
-    "quicktable",
-    "ckeditor"
-  ],
-  "homepage": "https://github.com/ufdada/quicktable",
-  "author": {
-    "name": "ufdada"
-  },
-  "scripts": {
-    "test": "grunt test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ufdada/quicktable.git"
-  },
-  "bugs": {
-    "url": "https://github.com/ufdada/quicktable/issues"
-  },
-  "license": "LGPL",
-  "devDependencies": {
-    "grunt": "0.4.5",
-    "grunt-contrib-compress": "0.10.0",
-    "grunt-contrib-jshint": "0.10.0",
-    "grunt-lint5": "0.3.0",
-    "grunt-markdown": "0.6.1"
-  }
-}

+ 0 - 469
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/quicktable/template.jst

@@ -1,469 +0,0 @@
-<!DOCTYPE  html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    
-    <title>doc</title>
-    <style>
-      /*github.com style (c) Vasily Polovnyov <vast@whiteants.net>*/
-      pre code {
-        display: block; padding: 0.5em;
-        color: #333;
-        background: #f8f8ff
-      }
-      pre .comment,
-      pre .template_comment,
-      pre .diff .header,
-      pre .javadoc {
-        color: #998;
-        font-style: italic
-      }
-      pre .keyword,
-      pre .css .rule .keyword,
-      pre .winutils,
-      pre .javascript .title,
-      pre .nginx .title,
-      pre .subst,
-      pre .request,
-      pre .status {
-        color: #333;
-        font-weight: bold
-      }
-      pre .number,
-      pre .hexcolor,
-      pre .ruby .constant {
-        color: #099;
-      }
-      pre .string,
-      pre .tag .value,
-      pre .phpdoc,
-      pre .tex .formula {
-        color: #d14
-      }
-      pre .title,
-      pre .id {
-        color: #900;
-        font-weight: bold
-      }
-      pre .javascript .title,
-      pre .lisp .title,
-      pre .clojure .title,
-      pre .subst {
-        font-weight: normal
-      }
-      pre .class .title,
-      pre .haskell .type,
-      pre .vhdl .literal,
-      pre .tex .command {
-        color: #458;
-        font-weight: bold
-      }
-      pre .tag,
-      pre .tag .title,
-      pre .rules .property,
-      pre .django .tag .keyword {
-        color: #000080;
-        font-weight: normal
-      }
-      pre .attribute,
-      pre .variable,
-      pre .lisp .body {
-        color: #008080
-      }
-      pre .regexp {
-        color: #009926
-      }
-      pre .class {
-        color: #458;
-        font-weight: bold
-      }
-      pre .symbol,
-      pre .ruby .symbol .string,
-      pre .lisp .keyword,
-      pre .tex .special,
-      pre .prompt {
-        color: #990073
-      }
-      pre .built_in,
-      pre .lisp .title,
-      pre .clojure .built_in {
-        color: #0086b3
-      }
-      pre .preprocessor,
-      pre .pi,
-      pre .doctype,
-      pre .shebang,
-      pre .cdata {
-        color: #999;
-        font-weight: bold
-      }
-      pre .deletion {
-        background: #fdd
-      }
-      pre .addition {
-        background: #dfd
-      }
-      pre .diff .change {
-        background: #0086b3
-      }
-      pre .chunk {
-        color: #aaa
-      }
-	body {
-		font-family: Helvetica, arial, sans-serif;
-		font-size: 14px;
-		line-height: 1.6;
-		padding-top: 10px;
-		padding-bottom: 10px;
-		background-color: white;
-		padding: 30px;
-	}
-
-	body > *:first-child {
-		margin-top: 0 !important;
-	}
-	body > *:last-child {
-		margin-bottom: 0 !important;
-	}
-
-	a {
-		color: #4183C4;
-		text-decoration: none;
-	}
-	a:hover {
-		text-decoration: underline;
-	}
-	a.absent {
-		color: #cc0000;
-	}
-	a.anchor {
-		display: block;
-		padding-left: 30px;
-		margin-left: -30px;
-		cursor: pointer;
-		position: absolute;
-		top: 0;
-		left: 0;
-		bottom: 0;
-	}
-
-	h1, h2, h3, h4, h5, h6 {
-		margin: 1em 0 15px;
-		padding: 0;
-		font-weight: bold;
-		-webkit-font-smoothing: antialiased;
-		cursor: text;
-		position: relative;
-	}
-
-	h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor, h5:hover a.anchor, h6:hover a.anchor {
-		background: url("../../images/modules/styleguide/para.png") no-repeat 10px center;
-		text-decoration: none;
-	}
-
-	h1 tt, h1 code {
-		font-size: inherit;
-	}
-
-	h2 tt, h2 code {
-		font-size: inherit;
-	}
-
-	h3 tt, h3 code {
-		font-size: inherit;
-	}
-
-	h4 tt, h4 code {
-		font-size: inherit;
-	}
-
-	h5 tt, h5 code {
-		font-size: inherit;
-	}
-
-	h6 tt, h6 code {
-		font-size: inherit;
-	}
-
-	h1 {
-		font-size: 2.5em;
-		color: black;
-		border-bottom: 1px solid #ddd;
-	}
-
-	h2 {
-		font-size: 2em;
-		border-bottom: 1px solid #cccccc;
-		color: black;
-	}
-
-	h3 {
-		font-size: 1.5em;
-	}
-
-	h4 {
-		font-size: 1.2em;
-	}
-
-	h5 {
-		font-size: 1em;
-	}
-
-	h6 {
-		color: #777777;
-		font-size: 1em;
-	}
-
-	p, blockquote, ul, ol, dl, li, table, pre {
-		/* margin: 15px 0; */
-	}
-
-	hr {
-		background: transparent url("../../images/modules/pulls/dirty-shade.png") repeat-x 0 0;
-		border: 0 none;
-		color: #cccccc;
-		height: 4px;
-		padding: 0;
-	}
-
-	body > h2:first-child {
-		margin-top: 0;
-		padding-top: 0;
-	}
-	body > h1:first-child {
-		margin-top: 0;
-		padding-top: 0;
-	}
-	body > h1:first-child + h2 {
-		margin-top: 0;
-		padding-top: 0;
-	}
-	body > h3:first-child, body > h4:first-child, body > h5:first-child, body > h6:first-child {
-		margin-top: 0;
-		padding-top: 0;
-	}
-
-	a:first-child h1, a:first-child h2, a:first-child h3, a:first-child h4, a:first-child h5, a:first-child h6 {
-		margin-top: 0;
-		padding-top: 0;
-	}
-
-	h1 p, h2 p, h3 p, h4 p, h5 p, h6 p {
-		margin-top: 0;
-	}
-
-	li p.first {
-		display: inline-block;
-	}
-
-	ul, ol {
-		padding-left: 30px;
-	}
-
-	ul :first-child, ol :first-child {
-		margin-top: 0;
-	}
-
-	ul :last-child, ol :last-child {
-		margin-bottom: 0;
-	}
-
-	dl {
-		padding: 0;
-	}
-	dl dt {
-		font-size: 14px;
-		font-weight: bold;
-		font-style: italic;
-		padding: 0;
-		margin: 15px 0 5px;
-	}
-	dl dt:first-child {
-		padding: 0;
-	}
-	dl dt > :first-child {
-		margin-top: 0;
-	}
-	dl dt > :last-child {
-		margin-bottom: 0;
-	}
-	dl dd {
-		margin: 0 0 15px;
-		padding: 0 15px;
-	}
-	dl dd > :first-child {
-		margin-top: 0;
-	}
-	dl dd > :last-child {
-		margin-bottom: 0;
-	}
-
-	blockquote {
-		border-left: 4px solid #dddddd;
-		padding: 0 15px;
-		color: #777777;
-	}
-	blockquote > :first-child {
-		margin-top: 0;
-	}
-	blockquote > :last-child {
-		margin-bottom: 0;
-	}
-
-	table {
-		padding: 0;
-	}
-	table tr {
-		border-top: 1px solid #cccccc;
-		background-color: white;
-		margin: 0;
-		padding: 0;
-	}
-	table tr:nth-child(2n) {
-		background-color: #f8f8f8;
-	}
-	table tr th {
-		font-weight: bold;
-		border: 1px solid #cccccc;
-		text-align: left;
-		margin: 0;
-		padding: 6px 13px;
-	}
-	table tr td {
-		border: 1px solid #cccccc;
-		text-align: left;
-		margin: 0;
-		padding: 6px 13px;
-	}
-	table tr th :first-child, table tr td :first-child {
-		margin-top: 0;
-	}
-	table tr th :last-child, table tr td :last-child {
-		margin-bottom: 0;
-	}
-
-	img {
-		max-width: 100%;
-	}
-
-	span.frame {
-		display: block;
-		overflow: hidden;
-	}
-	span.frame > span {
-		border: 1px solid #dddddd;
-		display: block;
-		float: left;
-		overflow: hidden;
-		margin: 13px 0 0;
-		padding: 7px;
-		width: auto;
-	}
-	span.frame span img {
-		display: block;
-		float: left;
-	}
-	span.frame span span {
-		clear: both;
-		color: #333333;
-		display: block;
-		padding: 5px 0 0;
-	}
-	span.align-center {
-		display: block;
-		overflow: hidden;
-		clear: both;
-	}
-	span.align-center > span {
-		display: block;
-		overflow: hidden;
-		margin: 13px auto 0;
-		text-align: center;
-	}
-	span.align-center span img {
-		margin: 0 auto;
-		text-align: center;
-	}
-	span.align-right {
-		display: block;
-		overflow: hidden;
-		clear: both;
-	}
-	span.align-right > span {
-		display: block;
-		overflow: hidden;
-		margin: 13px 0 0;
-		text-align: right;
-	}
-	span.align-right span img {
-		margin: 0;
-		text-align: right;
-	}
-	span.float-left {
-		display: block;
-		margin-right: 13px;
-		overflow: hidden;
-		float: left;
-	}
-	span.float-left span {
-		margin: 13px 0 0;
-	}
-	span.float-right {
-		display: block;
-		margin-left: 13px;
-		overflow: hidden;
-		float: right;
-	}
-	span.float-right > span {
-		display: block;
-		overflow: hidden;
-		margin: 13px auto 0;
-		text-align: right;
-	}
-
-	code, tt {
-		margin: 0 2px;
-		padding: 0 5px;
-		white-space: nowrap;
-		border: 1px solid #eaeaea;
-		background-color: #f8f8f8;
-		border-radius: 3px;
-	}
-
-	pre code {
-		margin: 0;
-		padding: 0;
-		white-space: pre;
-		border: none;
-		background: transparent;
-	}
-
-	.highlight pre {
-		background-color: #f8f8f8;
-		border: 1px solid #cccccc;
-		font-size: 13px;
-		line-height: 19px;
-		overflow: auto;
-		padding: 6px 10px;
-		border-radius: 3px;
-	}
-
-	pre {
-		background-color: #f8f8f8;
-		border: 1px solid #cccccc;
-		font-size: 13px;
-		line-height: 19px;
-		overflow: auto;
-		padding: 6px 10px;
-		border-radius: 3px;
-	}
-	pre code, pre tt {
-		background-color: transparent;
-		border: none;
-	}
-    </style>
-  </head>
-  <body>  
-    <%=content%>
-  </body>
-</html>

+ 1 - 1
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/tableresize/dev/tableresize.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 -->
 <html>

+ 15 - 4
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/tableresize/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -27,7 +27,7 @@
 				computed = 0;
 		}
 
-		return parseInt( computed, 10 );
+		return parseFloat( computed );
 	}
 
 	// Sets pillar height and position based on given table element (head, body, footer).
@@ -51,7 +51,9 @@
 				pillarRow,
 				pillarHeight = 0,
 				pillarPosition = null,
-				pillarDimensions = setPillarDimensions( $tr );
+				pillarDimensions = setPillarDimensions( $tr ),
+				isIE = CKEDITOR.env.ie && !CKEDITOR.env.edge,
+				isBorderCollapse = table.getComputedStyle( 'border-collapse' ) === 'collapse';
 
 			pillarHeight = pillarDimensions.height;
 			pillarPosition = pillarDimensions.position;
@@ -90,6 +92,15 @@
 
 				pillarWidth = Math.max( pillarRight - pillarLeft, 3 );
 
+				// In case of IE and collapsed table border, we must substract pillarWidth
+				// from the current position and recalculate pillarWidth (#2823).
+				if ( isIE && isBorderCollapse ) {
+					pillarLeft -= pillarWidth;
+
+					pillarWidth = Math.max( pillarRight - pillarLeft, 3 );
+				}
+
+
 				// The pillar should reflects exactly the shape of the hovered
 				// column border line.
 				pillar = {
@@ -275,7 +286,7 @@
 
 		resizer = CKEDITOR.dom.element.createFromHtml( '<div data-cke-temp=1 contenteditable=false unselectable=on ' +
 			'style="position:absolute;cursor:col-resize;filter:alpha(opacity=0);opacity:0;' +
-				'padding:0;background-color:#004;background-image:none;border:0px none;z-index:10"></div>', document );
+				'padding:0;background-color:#004;background-image:none;border:0px none;z-index:10000"></div>', document );
 
 		// Clean DOM when editor is destroyed.
 		editor.on( 'destroy', function() {

+ 4 - 3
o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/tableresize/samples/tableresize.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <!--
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 -->
-<html>
+<html lang="en">
 <head>
 	<meta charset="utf-8">
 	<title>Using TableResize Plugin &mdash; CKEditor Sample</title>
@@ -12,6 +12,7 @@ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 	<meta name="ckeditor-sample-name" content="TableResize plugin">
 	<meta name="ckeditor-sample-group" content="Plugins">
 	<meta name="ckeditor-sample-description" content="Using the TableResize plugin to enable table column resizing.">
+	<meta name="description" content="Try the latest sample of CKEditor 4 and learn more about customizing your WYSIWYG editor with endless possibilities.">
 </head>
 <body>
 	<h1 class="samples">
@@ -99,7 +100,7 @@ CKEDITOR.replace( '<em>textarea_id</em>', {
 			CKEditor - The text editor for the Internet - <a class="samples" href="https://ckeditor.com/">https://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2019, <a class="samples" href="https://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2020, <a class="samples" href="https://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>