Merge branch 't/9599'

Author: Reinmar

plugins/magicline/dev/magicline.html

@@ -582,8 +582,7 @@ <h2>Enter mode: BR</h2>
 		CKEDITOR.replace( 'editor4' );
 
 		CKEDITOR.replace( 'hood', {
-			magicline_color: 'green',
-			magicline_opacity: .3
+			magicline_color: 'green'
 		});
 
 		CKEDITOR.replace( 'editor5', {

plugins/magicline/plugin.js

@@ -708,8 +708,6 @@
 		// Make the box unselectable.
 		line.unselectable();
 
-		line.setOpacity( that.editor.config.magicline_opacity || 1 );
-
 		// Handle accessSpace node insertion.
 		line.lineChildren[ 0 ].on( 'mouseup', function( event ) {
 			line.detach();
@@ -1518,24 +1516,24 @@
  * causes the box to appear. The distance is expressed in pixels (px).
  *
  *		// Increases the offset to 15px.
- *		CKEDITOR.config.line_triggerOffset = 15;
+ *		CKEDITOR.config.magicline_triggerOffset = 15;
  *
- * @cfg {Number} [line_triggerOffset=30]
+ * @cfg {Number} [magicline_triggerOffset=30]
  * @member CKEDITOR.config
- * @see CKEDITOR.config#line_holdDistance
+ * @see CKEDITOR.config#magicline_holdDistance
  */
 
 /**
  * Defines the distance between mouse pointer and the box, within
  * which the box stays revealed and no other focus space is offered to be accessed.
- * The value is relative to {@link #line_triggerOffset}.
+ * The value is relative to {@link #magicline_triggerOffset}.
  *
- *		// Increases the distance to 80% of CKEDITOR.config.line_triggerOffset.
- *		CKEDITOR.config.line_holdDistance = .8;
+ *		// Increases the distance to 80% of CKEDITOR.config.magicline_triggerOffset.
+ *		CKEDITOR.config.magicline_holdDistance = .8;
  *
- * @cfg {Number} [line_holdDistance=0.5]
+ * @cfg {Number} [magicline_holdDistance=0.5]
  * @member CKEDITOR.config
- * @see CKEDITOR.config#line_triggerOffset
+ * @see CKEDITOR.config#magicline_triggerOffset
  */
 
 // %REMOVE_START%
@@ -1545,10 +1543,10 @@
  * holds start of the current selection or just simply holds the caret.
  *
  *		// Changes keystroke to CTRL + SHIFT + ,
- *		CKEDITOR.config.line_keystrokeBefore = CKEDITOR.CTRL + CKEDITOR.SHIFT + 188;
+ *		CKEDITOR.config.magicline_keystrokeBefore = CKEDITOR.CTRL + CKEDITOR.SHIFT + 188;
  *
  * @ignore
- * @cfg {Number} [line_keystrokeBefore=CKEDITOR.CTRL + CKEDITOR.SHIFT + 219 (CTRL + SHIFT + [)]
+ * @cfg {Number} [magicline_keystrokeBefore=CKEDITOR.CTRL + CKEDITOR.SHIFT + 219 (CTRL + SHIFT + [)]
  * @member CKEDITOR.config
  */
 // CKEDITOR.config.magicline_keystrokeBefore = CKEDITOR.CTRL + CKEDITOR.SHIFT + 219; // CTRL + SHIFT + [
@@ -1558,10 +1556,10 @@
  * holds start of the current selection or just simply holds the caret.
  *
  *		// Changes keystroke to CTRL + SHIFT + .
- *		CKEDITOR.config.line_keystrokeBefore = CKEDITOR.CTRL + CKEDITOR.SHIFT + 190;
+ *		CKEDITOR.config.magicline_keystrokeBefore = CKEDITOR.CTRL + CKEDITOR.SHIFT + 190;
  *
  * @ignore
- * @cfg {Number} [line_keystrokeBefore=CKEDITOR.CTRL + CKEDITOR.SHIFT + 221 (CTRK + SHIFT + ])]
+ * @cfg {Number} [magicline_keystrokeBefore=CKEDITOR.CTRL + CKEDITOR.SHIFT + 221 (CTRK + SHIFT + ])]
  * @member CKEDITOR.config
  */
 // CKEDITOR.config.magicline_keystrokeAfter = CKEDITOR.CTRL + CKEDITOR.SHIFT + 221; // CTRL + SHIFT + ]
@@ -1572,20 +1570,9 @@
  * Defines box color. The color may be adjusted to enhance readability.
  *
  *		// Changes color to blue.
- *		CKEDITOR.config.line_boxColor = '#0000FF';
- *
- * @cfg {String} [line_boxColor='#FF0000']
- * @member CKEDITOR.config
- */
-
-/**
- * Defines box opacity. The opacity may be adjusted to enhance readability
- * by revealing underlying elements.
- *
- *		// Changes opacity to 30%.
- *		CKEDITOR.config.line_boxOpacity = .3;
+ *		CKEDITOR.config.magicline_color = '#0000FF';
  *
- * @cfg {Number} [line_boxOpacity=1]
+ * @cfg {String} [magicline_color='#FF0000']
  * @member CKEDITOR.config
  */
 
@@ -1594,8 +1581,8 @@
  * {@link CKEDITOR.dtd#$block} elements as accessible by the box.
  *
  *		// Enables "put everywhere" mode.
- *		CKEDITOR.config.line_putEverywhere = true;
+ *		CKEDITOR.config.magicline_putEverywhere = true;
  *
- * @cfg {Boolean} [line_putEverywhere=false]
+ * @cfg {Boolean} [magicline_putEverywhere=false]
  * @member CKEDITOR.config
  */

plugins/magicline/samples/magicline.html

@@ -113,12 +113,11 @@ <h1 class="samples">
 		</label>
 		<div class="description">
 			<p>
-				This editor is using a blue line with slight opacity.
+				This editor is using a blue line.
 			</p>
 <pre class="samples">
 CKEDITOR.replace( 'editor2', {
-	magicline_color: 'blue',
-	magicline_opacity: .8
+	magicline_color: 'blue'
 });</pre>
 		</div>
 		<textarea cols="80" id="editor2" name="editor2" rows="10">
@@ -182,8 +181,7 @@ <h1 class="samples">
 			// window.onload event handler.
 
 			CKEDITOR.replace( 'editor2', {
-				magicline_color: 'blue',	// Blue line
-				magicline_opacity: .5
+				magicline_color: 'blue' // Blue line
 			});
 
 		</script>