Skip to content
Permalink
Browse files

Merge branch 't/12875' into major

  • Loading branch information...
Reinmar committed Feb 20, 2015
2 parents 49684fd + 9126ab7 commit 681778d52a95bc9957f01aa9414fb415913bb4bf
Showing with 25,723 additions and 253 deletions.
  1. +7 −1 .gitignore
  2. +1 −1 core/tools.js
  3. +2 −0 dev/builder/build-config.js
  4. +85 −0 dev/tasks/samples.js
  5. +2 −1 gruntfile.js
  6. +4 −0 package.json
  7. +5 −2 plugins/autogrow/samples/autogrow.html
  8. +1 −1 plugins/bbcode/dev/bbcode.html
  9. +6 −3 plugins/bbcode/samples/bbcode.html
  10. +1 −1 plugins/clipboard/dev/clipboard.html
  11. +1 −1 plugins/clipboard/dev/dnd.html
  12. +5 −2 plugins/codesnippet/samples/codesnippet.html
  13. +1 −1 plugins/codesnippetgeshi/dev/codesnippetgeshi.html
  14. +5 −2 plugins/devtools/samples/devtools.html
  15. +5 −2 plugins/dialog/samples/dialog.html
  16. +6 −3 plugins/divarea/samples/divarea.html
  17. +6 −3 plugins/docprops/samples/docprops.html
  18. +5 −2 plugins/enterkey/samples/enterkey.html
  19. +6 −3 plugins/htmlwriter/samples/outputforflash.html
  20. +6 −3 plugins/htmlwriter/samples/outputhtml.html
  21. +2 −2 plugins/image2/dev/image2.html
  22. +5 −2 plugins/image2/samples/image2.html
  23. +2 −2 plugins/lineutils/dev/dnd.html
  24. +2 −2 plugins/lineutils/dev/magicfinger.html
  25. +1 −1 plugins/magicline/dev/magicline.html
  26. +5 −2 plugins/magicline/samples/magicline.html
  27. +2 −2 plugins/mathjax/dev/mathjax.html
  28. +5 −2 plugins/mathjax/samples/mathjax.html
  29. +1 −2 plugins/placeholder/dev/placeholder.html
  30. +6 −3 plugins/placeholder/samples/placeholder.html
  31. +5 −2 plugins/sharedspace/samples/sharedspace.html
  32. +5 −2 plugins/sourcedialog/samples/sourcedialog.html
  33. +6 −3 plugins/stylesheetparser/samples/stylesheetparser.html
  34. +1 −1 plugins/tableresize/dev/tableresize.html
  35. +5 −2 plugins/tableresize/samples/tableresize.html
  36. +5 −2 plugins/toolbar/samples/toolbar.html
  37. +5 −2 plugins/uicolor/samples/uicolor.html
  38. +2 −2 plugins/undo/dev/snapshot.html
  39. +3 −3 plugins/uploadwidget/dev/upload.html
  40. +1 −2 plugins/widget/dev/nestedwidgets.html
  41. +1 −2 plugins/widget/dev/widgetstyles.html
  42. +7 −4 plugins/wysiwygarea/samples/fullpage.html
  43. +521 −0 samples/css/sample.css
  44. +1 −0 samples/css/sample.css.map
  45. +92 −0 samples/fonts/indieflower/OFL.txt
  46. BIN samples/fonts/indieflower/indieflower.eot
  47. +242 −0 samples/fonts/indieflower/indieflower.svg
  48. BIN samples/fonts/indieflower/indieflower.ttf
  49. BIN samples/fonts/indieflower/indieflower.woff
  50. +93 −0 samples/fonts/mavenpro/OFL.txt
  51. BIN samples/fonts/mavenpro/mavenpro-bold.eot
  52. +3,016 −0 samples/fonts/mavenpro/mavenpro-bold.svg
  53. BIN samples/fonts/mavenpro/mavenpro-bold.ttf
  54. BIN samples/fonts/mavenpro/mavenpro-bold.woff
  55. BIN samples/fonts/mavenpro/mavenpro-medium.eot
  56. +3,016 −0 samples/fonts/mavenpro/mavenpro-medium.svg
  57. BIN samples/fonts/mavenpro/mavenpro-medium.ttf
  58. BIN samples/fonts/mavenpro/mavenpro-medium.woff
  59. BIN samples/fonts/mavenpro/mavenpro-regular.eot
  60. +3,016 −0 samples/fonts/mavenpro/mavenpro-regular.svg
  61. BIN samples/fonts/mavenpro/mavenpro-regular.ttf
  62. BIN samples/fonts/mavenpro/mavenpro-regular.woff
  63. BIN samples/img/github-top.png
  64. BIN samples/img/header-bg.png
  65. BIN samples/img/header-separator.png
  66. BIN samples/img/logo.png
  67. BIN samples/img/navigation-tip.png
  68. +97 −155 samples/index.html
  69. +53 −0 samples/js/sample.js
  70. +54 −0 samples/less/base.less
  71. +18 −0 samples/less/fonts.less
  72. +892 −0 samples/less/lesshat.less
  73. +500 −0 samples/less/sample.less
  74. +4 −1 samples/{ → old}/ajax.html
  75. +4 −1 samples/{ → old}/api.html
  76. +4 −1 samples/{ → old}/appendto.html
  77. BIN samples/{ → old}/assets/inlineall/logo.png
  78. 0 samples/{ → old}/assets/outputxhtml/outputxhtml.css
  79. 0 samples/{ → old}/assets/posteddata.php
  80. BIN samples/{ → old}/assets/sample.jpg
  81. 0 samples/{ → old}/assets/uilanguages/languages.js
  82. +4 −1 samples/{ → old}/datafiltering.html
  83. +4 −1 samples/{ → old}/divreplace.html
  84. +179 −0 samples/old/index.html
  85. +4 −1 samples/{ → old}/inlineall.html
  86. +4 −1 samples/{ → old}/inlinebycode.html
  87. +4 −1 samples/{ → old}/inlinetextarea.html
  88. +6 −3 samples/{ → old}/jquery.html
  89. +4 −1 samples/{ → old}/readonly.html
  90. +4 −1 samples/{ → old}/replacebyclass.html
  91. +4 −1 samples/{ → old}/replacebycode.html
  92. +4 −0 samples/{ → old}/sample.css
  93. 0 samples/{ → old}/sample.js
  94. 0 samples/{ → old}/sample_posteddata.php
  95. +4 −1 samples/{ → old}/tabindex.html
  96. +4 −1 samples/{ → old}/uicolor.html
  97. +4 −1 samples/{ → old}/uilanguages.html
  98. +5 −2 samples/{ → old}/xhtmlstyle.html
  99. +52 −0 samples/toolbarconfigurator/bender.js
  100. +55 −0 samples/toolbarconfigurator/css/fontello.css
  101. +450 −0 samples/toolbarconfigurator/css/toolbarmodifier.css
  102. +1 −0 samples/toolbarconfigurator/css/toolbarmodifier.css.map
  103. +12 −0 samples/toolbarconfigurator/font/LICENSE.txt
  104. +28 −0 samples/toolbarconfigurator/font/config.json
  105. BIN samples/toolbarconfigurator/font/fontello.eot
  106. +14 −0 samples/toolbarconfigurator/font/fontello.svg
  107. BIN samples/toolbarconfigurator/font/fontello.ttf
  108. BIN samples/toolbarconfigurator/font/fontello.woff
  109. +240 −0 samples/toolbarconfigurator/index.html
  110. +484 −0 samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
  111. +360 −0 samples/toolbarconfigurator/js/fulltoolbareditor.js
  112. +1,353 −0 samples/toolbarconfigurator/js/toolbarmodifier.js
  113. +618 −0 samples/toolbarconfigurator/js/toolbartextmodifier.js
  114. +490 −0 samples/toolbarconfigurator/less/toolbarmodifier.less
  115. +19 −0 samples/toolbarconfigurator/lib/codemirror/LICENSE
  116. +11 −0 samples/toolbarconfigurator/lib/codemirror/README.md
  117. +309 −0 samples/toolbarconfigurator/lib/codemirror/codemirror.css
  118. +8,045 −0 samples/toolbarconfigurator/lib/codemirror/codemirror.js
  119. +638 −0 samples/toolbarconfigurator/lib/codemirror/javascript.js
  120. +37 −0 samples/toolbarconfigurator/lib/codemirror/neo.css
  121. +38 −0 samples/toolbarconfigurator/lib/codemirror/show-hint.css
  122. +350 −0 samples/toolbarconfigurator/lib/codemirror/show-hint.js
  123. +12 −0 samples/toolbarconfigurator/package.json
  124. +9 −0 samples/toolbarconfigurator/tests/one.js
@@ -4,7 +4,7 @@
#
# Be sure to append /** to folders to have everything inside them ignored.

# All "dot directoties".
# All "dot directories".
.*/**

node_modules/**
@@ -15,4 +15,10 @@ dev/builder/ckbuilder/**
dev/langtool/po/**
dev/langtool/cklangtool/**

samples/toolbarconfigurator/.bender/**
samples/toolbarconfigurator/node_modules/**
samples/toolbarconfigurator/docs/**

*.css.map

bender-*.log
@@ -1220,7 +1220,7 @@
* @param {Boolean} [withAppend] Whether to append created elements to the `doc`.
*/
enableHtml5Elements: function( doc, withAppend ) {
var els = 'abbr,article,aside,audio,bdi,canvas,data,datalist,details,figcaption,figure,footer,header,hgroup,mark,meter,nav,output,progress,section,summary,time,video'.split( ',' ),
var els = 'abbr,article,aside,audio,bdi,canvas,data,datalist,details,figcaption,figure,footer,header,hgroup,main,mark,meter,nav,output,progress,section,summary,time,video'.split( ',' ),
i = els.length,
el;

@@ -13,6 +13,7 @@ var CKBUILDER_CONFIG = {
'bender-err.log',
'bender-out.log',
'dev',
'docs',
'.DS_Store',
'.editorconfig',
'.gitignore',
@@ -22,6 +23,7 @@ var CKBUILDER_CONFIG = {
'.jscsrc',
'.jshintignore',
'.jshintrc',
'less',
'.mailmap',
'node_modules',
'package.json',
@@ -0,0 +1,85 @@
/* jshint node: true, browser: false, es3: false */

'use strict';

module.exports = function( grunt ) {
var cssBanner = [
'/*',
'Copyright (c) 2003-' + new Date().getFullYear() + ', CKSource - Frederico Knabben. All rights reserved.',
'For licensing, see LICENSE.html or http://cksource.com/ckeditor/license',
'*/'
].join( '\n' );

grunt.config.merge( {
less: {
basicsample: {
files: [
{
src: 'samples/less/sample.less',
dest: 'samples/css/sample.css'
}
],

options: {
paths: [ 'samples/' ],

banner: cssBanner,
sourceMap: true,
sourceMapFilename: 'samples/css/sample.css.map',
sourceMapURL: 'sample.css.map',
sourceMapRootpath: '../../'
}
},

toolbarconfigurator: {
files: [
{
src: 'samples/toolbarconfigurator/less/toolbarmodifier.less',
dest: 'samples/toolbarconfigurator/css/toolbarmodifier.css'
}
],

options: {
paths: [ 'samples/toolbarconfigurator' ],

banner: cssBanner,
sourceMap: true,
sourceMapFilename: 'samples/toolbarconfigurator/css/toolbarmodifier.css.map',
sourceMapURL: 'toolbarmodifier.css.map',
sourceMapRootpath: '../../'
}
}
},

watch: {
basicsample: {
files: '<%= less.basicsample.options.paths[ 0 ] + "/**/*.less" %>',
tasks: [ 'less:basicsample' ],
options: {
nospawn: true
}
},

toolbarconfigurator: {
files: '<%= less.toolbarconfigurator.options.paths[ 0 ] + "/**/*.less" %>',
tasks: [ 'less:toolbarconfigurator' ],
options: {
nospawn: true
}
}
},

jsduck: {
toolbarconfigurator: {
src: [
'samples/toolbarconfigurator/js'
],
dest: 'samples/toolbarconfigurator/docs'
}
}
} );

grunt.loadNpmTasks( 'grunt-contrib-less' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-jsduck' );
};
@@ -15,6 +15,7 @@ module.exports = function( grunt ) {
'plugins/**/lang/**',
'plugins/uicolor/yui/**',
'plugins/htmlwriter/samples/assets/outputforflash/**',
'samples/toolbarconfigurator/lib/**',
'tests/adapters/jquery/_assets/**',
'tests/core/dom/_assets/**',
'tests/core/selection/_helpers/rangy.js'
@@ -80,4 +81,4 @@ module.exports = function( grunt ) {

grunt.loadNpmTasks( 'grunt-contrib-imagemin' );
grunt.registerTask( 'images', 'Optimizes images which are not processed later by the CKBuilder (i.e. icons).', [ 'imagemin' ] );
};
};
@@ -11,7 +11,11 @@
"grunt-contrib-imagemin": "^0.8.1",
"grunt-jscs": "~1",
"grunt-contrib-jshint": "~0",
"grunt-contrib-less": "~1.0.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-jsduck": "^1.0.1",
"grunt-githooks": "~0",
"less": "~2.3.1",
"shelljs": "~0"
},
"scripts": {
@@ -8,15 +8,18 @@
<meta charset="utf-8">
<title>AutoGrow Plugin &mdash; CKEditor Sample</title>
<script src="../../../ckeditor.js"></script>
<link rel="stylesheet" href="../../../samples/sample.css">
<link rel="stylesheet" href="../../../samples/old/sample.css">
<meta name="ckeditor-sample-name" content="AutoGrow plugin">
<meta name="ckeditor-sample-group" content="Plugins">
<meta name="ckeditor-sample-description" content="Using the AutoGrow plugin in order to make the editor grow to fit the size of its content.">
</head>
<body>
<h1 class="samples">
<a href="../../../samples/index.html">CKEditor Samples</a> &raquo; Using AutoGrow Plugin
<a href="../../../samples/old/index.html">CKEditor Samples</a> &raquo; Using AutoGrow Plugin
</h1>
<div class="warning deprecated">
This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/autogrow.html">brand new version in CKEditor SDK</a>.
</div>
<div class="description">
<p>
This sample shows how to configure CKEditor instances to use the
@@ -8,7 +8,7 @@
<meta charset="utf-8">
<title>BBCode plugin playground &ndash; CKEditor Sample</title>
<script src="../../../ckeditor.js"></script>
<link href="../../../samples/sample.css" rel="stylesheet">
<link href="../../../samples/old/sample.css" rel="stylesheet">
<style>
body {
margin: 0;
@@ -8,17 +8,20 @@
<meta charset="utf-8">
<title>BBCode Plugin &mdash; CKEditor Sample</title>
<script src="../../../ckeditor.js"></script>
<script src="../../../samples/sample.js"></script>
<link rel="stylesheet" href="../../../samples/sample.css">
<script src="../../../samples/old/sample.js"></script>
<link rel="stylesheet" href="../../../samples/old/sample.css">
<meta name="ckeditor-sample-required-plugins" content="sourcearea">
<meta name="ckeditor-sample-name" content="Output for BBCode">
<meta name="ckeditor-sample-group" content="Additional Plugins">
<meta name="ckeditor-sample-description" content="Configuring CKEditor to produce BBCode tags instead of HTML.">
</head>
<body>
<h1 class="samples">
<a href="../../../samples/index.html">CKEditor Samples</a> &raquo; BBCode Plugin
<a href="../../../samples/old/index.html">CKEditor Samples</a> &raquo; BBCode Plugin
</h1>
<div class="warning deprecated">
This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/bbcode.html">brand new version in CKEditor SDK</a>.
</div>
<div class="description">
<p>
This sample shows how to configure CKEditor to output <a href="http://en.wikipedia.org/wiki/BBCode">BBCode</a> format instead of HTML.
@@ -8,7 +8,7 @@
<meta charset="utf-8">
<title>Clipboard playground &ndash; CKEditor Sample</title>
<script src="../../../ckeditor.js"></script>
<link href="../../../samples/sample.css" rel="stylesheet">
<link href="../../../samples/old/sample.css" rel="stylesheet">
<style>
body {
margin: 0;
@@ -10,7 +10,7 @@
<script src="../../../ckeditor.js"></script>
<script src="../../../dev/console/console.js"></script>
<script src="../../../plugins/clipboard/dev/console.js"></script>
<link rel="stylesheet" href="../../../samples/sample.css">
<link rel="stylesheet" href="../../../samples/old/sample.css">
<style type="text/css">
h2 {
margin: 10px 0px 4px 0px;
@@ -8,7 +8,7 @@
<meta charset="utf-8">
<title>Code Snippet &mdash; CKEditor Sample</title>
<script src="../../../ckeditor.js"></script>
<link href="../../../samples/sample.css" rel="stylesheet">
<link href="../../../samples/old/sample.css" rel="stylesheet">
<!-- %REMOVE_LINE%
<link href="../../../plugins/codesnippet/lib/highlight/styles/monokai_sublime.css" rel="stylesheet">
%REMOVE_LINE% -->
@@ -28,8 +28,11 @@
</head>
<body>
<h1 class="samples">
<a href="../../../samples/index.html">CKEditor Samples</a> &raquo; Code Snippet Plugin
<a href="../../../samples/old/index.html">CKEditor Samples</a> &raquo; Code Snippet Plugin
</h1>
<div class="warning deprecated">
This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/codesnippet.html">brand new version in CKEditor SDK</a>.
</div>

<div class="description">
<p>
@@ -8,7 +8,7 @@
<meta charset="utf-8">
<title>Code Snippet &mdash; CKEditor Sample</title>
<script src="../../../ckeditor.js"></script>
<link href="../../../samples/sample.css" rel="stylesheet">
<link href="../../../samples/old/sample.css" rel="stylesheet">
<meta name="ckeditor-sample-name" content="Code Snippet plugin">
<meta name="ckeditor-sample-group" content="Plugins">
<meta name="ckeditor-sample-description" content="View and modify code using the Code Snippet plugin.">
@@ -8,15 +8,18 @@
<meta charset="utf-8">
<title>Using DevTools Plugin &mdash; CKEditor Sample</title>
<script src="../../../ckeditor.js"></script>
<link rel="stylesheet" href="../../../samples/sample.css">
<link rel="stylesheet" href="../../../samples/old/sample.css">
<meta name="ckeditor-sample-name" content="Developer Tools plugin">
<meta name="ckeditor-sample-group" content="Plugins">
<meta name="ckeditor-sample-description" content="Using the Developer Tools plugin to display information about dialog window UI elements to allow for easier customization.">
</head>
<body>
<h1 class="samples">
<a href="../../../samples/index.html">CKEditor Samples</a> &raquo; Using the Developer Tools Plugin
<a href="../../../samples/old/index.html">CKEditor Samples</a> &raquo; Using the Developer Tools Plugin
</h1>
<div class="warning deprecated">
This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/devtools.html">brand new version in CKEditor SDK</a>.
</div>
<div class="description">
<p>
This sample shows how to configure CKEditor instances to use the
@@ -8,7 +8,7 @@
<meta charset="utf-8">
<title>Using API to Customize Dialog Windows &mdash; CKEditor Sample</title>
<script src="../../../ckeditor.js"></script>
<link rel="stylesheet" href="../../../samples/sample.css">
<link rel="stylesheet" href="../../../samples/old/sample.css">
<meta name="ckeditor-sample-name" content="Using the JavaScript API to customize dialog windows">
<meta name="ckeditor-sample-group" content="Advanced Samples">
<meta name="ckeditor-sample-description" content="Using the dialog windows API to customize dialog windows without changing the original editor code.">
@@ -134,8 +134,11 @@
</head>
<body>
<h1 class="samples">
<a href="../../../samples/index.html">CKEditor Samples</a> &raquo; Using CKEditor Dialog API
<a href="../../../samples/old/index.html">CKEditor Samples</a> &raquo; Using CKEditor Dialog API
</h1>
<div class="warning deprecated">
This sample is not maintained anymore. For more samples check out the <a href="http://sdk.ckeditor.com/">brand new samples in CKEditor SDK</a>.
</div>
<div class="description">
<p>
This sample shows how to use the

0 comments on commit 681778d

Please sign in to comment.
You can’t perform that action at this time.