Skip to content

Commit

Permalink
Merge branch 't/12875' into major
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Feb 20, 2015
2 parents 49684fd + 9126ab7 commit 681778d
Show file tree
Hide file tree
Showing 124 changed files with 25,723 additions and 253 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Expand Up @@ -4,7 +4,7 @@
#
# Be sure to append /** to folders to have everything inside them ignored.

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

node_modules/**
Expand All @@ -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
2 changes: 1 addition & 1 deletion core/tools.js
Expand Up @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions dev/builder/build-config.js
Expand Up @@ -13,6 +13,7 @@ var CKBUILDER_CONFIG = {
'bender-err.log',
'bender-out.log',
'dev',
'docs',
'.DS_Store',
'.editorconfig',
'.gitignore',
Expand All @@ -22,6 +23,7 @@ var CKBUILDER_CONFIG = {
'.jscsrc',
'.jshintignore',
'.jshintrc',
'less',
'.mailmap',
'node_modules',
'package.json',
Expand Down
85 changes: 85 additions & 0 deletions dev/tasks/samples.js
@@ -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' );
};
3 changes: 2 additions & 1 deletion gruntfile.js
Expand Up @@ -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'
Expand Down Expand Up @@ -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' ] );
};
};
4 changes: 4 additions & 0 deletions package.json
Expand Up @@ -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": {
Expand Down
7 changes: 5 additions & 2 deletions plugins/autogrow/samples/autogrow.html
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/bbcode/dev/bbcode.html
Expand Up @@ -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;
Expand Down
9 changes: 6 additions & 3 deletions plugins/bbcode/samples/bbcode.html
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion plugins/clipboard/dev/clipboard.html
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/clipboard/dev/dnd.html
Expand Up @@ -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;
Expand Down
7 changes: 5 additions & 2 deletions plugins/codesnippet/samples/codesnippet.html
Expand Up @@ -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% -->
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion plugins/codesnippetgeshi/dev/codesnippetgeshi.html
Expand Up @@ -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.">
Expand Down
7 changes: 5 additions & 2 deletions plugins/devtools/samples/devtools.html
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions plugins/dialog/samples/dialog.html
Expand Up @@ -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.">
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 681778d

Please sign in to comment.