https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110529
Revision: 110529
Author: inez
Date: 2012-02-01 22:38:57 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Port contentEditable demo to EditingSurface layout
Modified Paths:
--------------
trunk/extensions/VisualEditor/contentEditable/index.php
trunk/extensions/VisualEditor/contentEditable/views/es.SurfaceView.js
Added Paths:
-----------
trunk/extensions/VisualEditor/contentEditable/styles/
trunk/extensions/VisualEditor/contentEditable/styles/es.DocumentView.css
trunk/extensions/VisualEditor/contentEditable/styles/es.SurfaceView.css
Modified: trunk/extensions/VisualEditor/contentEditable/index.php
===================================================================
--- trunk/extensions/VisualEditor/contentEditable/index.php 2012-02-01
22:28:39 UTC (rev 110528)
+++ trunk/extensions/VisualEditor/contentEditable/index.php 2012-02-01
22:38:57 UTC (rev 110529)
@@ -3,15 +3,21 @@
<html>
<head>
<title>EditSurface Demo</title>
- <link rel="stylesheet"
href="../modules/es/styles/es.SurfaceView.css">
+ <link rel="stylesheet" href="styles/es.SurfaceView.css">
<link rel="stylesheet"
href="../modules/es/styles/es.ContextView.css">
<link rel="stylesheet"
href="../modules/es/styles/es.ContentView.css">
- <link rel="stylesheet"
href="../modules/es/styles/es.DocumentView.css">
+ <link rel="stylesheet" href="styles/es.DocumentView.css">
<link rel="stylesheet"
href="../modules/es/styles/es.Inspector.css">
<link rel="stylesheet"
href="../modules/es/styles/es.ToolbarView.css">
<link rel="stylesheet"
href="../modules/es/styles/es.MenuView.css">
<link rel="stylesheet" href="../modules/sandbox/sandbox.css">
<style>
+ ::-moz-selection {
+ background-color: #b3d6f6;
+ }
+ ::selection {
+ background-color: #b3d6f6;
+ }
body {
font-family: "Arial";
font-size: 1em;
Added: trunk/extensions/VisualEditor/contentEditable/styles/es.DocumentView.css
===================================================================
--- trunk/extensions/VisualEditor/contentEditable/styles/es.DocumentView.css
(rev 0)
+++ trunk/extensions/VisualEditor/contentEditable/styles/es.DocumentView.css
2012-02-01 22:38:57 UTC (rev 110529)
@@ -0,0 +1,159 @@
+.es-documentView {
+ cursor: text;
+ margin-top: 1em;
+ overflow: hidden;
+ /*-webkit-user-select: none;*/
+}
+
+.es-headingView,
+.es-tableView,
+.es-listView,
+.es-preView,
+.es-paragraphView {
+ margin: 1em;
+ margin-top: 0;
+ position: relative;
+ min-height: 1.5em;
+}
+
+.es-listItemView > .es-paragraphView {
+ margin-left: 0;
+ margin-right: 0;
+}
+.es-listItemView > .es-viewBranchNode-firstChild {
+ margin: 0;
+}
+
+.es-preView {
+ padding: 1em;
+ border: 1px dashed #2F6FAB;
+}
+.es-preView > * {
+ font-family: monospace,"Courier New";
+}
+
+.es-headingView-level1,
+.es-headingView-level2 {
+ border-bottom: 1px solid #AAA;
+}
+
+.es-headingView-level1 > * {
+ font-size: 188%;
+ font-weight: normal;
+}
+
+.es-headingView-level2 > * {
+ font-size: 150%;
+ font-weight: normal;
+}
+
+.es-headingView-level3 > * {
+ font-size: 132%;
+ font-weight: bold;
+}
+
+.es-headingView-level4 > * {
+ font-size: 116%;
+ font-weight: bold;
+}
+
+.es-headingView-level5 > * {
+ font-size: 100%;
+ font-weight: bold;
+}
+
+.es-headingView-level6 > * {
+ font-size: 80%;
+ font-weight: bold;
+}
+
+.es-listItemView {
+ position: relative;
+}
+
+.es-listItemView-bullet {
+ padding-left: 1.2em;
+}
+
+.es-listItemView-number {
+ padding-left: 3.2em;
+}
+
+.es-listItemView-icon {
+ position: absolute;
+ right: 100%;
+ height: 1.5em;
+ line-height: 1.5em;
+}
+
+.es-listItemView-bullet .es-listItemView-icon {
+ background-image: url(../images/bullet-icon.png);
+ background-position: left 0.6em;
+ background-repeat: no-repeat;
+ width: 5px;
+ margin-right: -0.5em;
+}
+
+.es-listItemView-number .es-listItemView-icon {
+ margin-right: -2.8em;
+}
+
+.es-listItemView-term {
+ font-weight: bold;
+}
+
+.es-listItemView-definition .es-contentView {
+ margin-left: 2em;
+}
+
+.es-listItemView-level0 {
+ margin-left: 0;
+}
+
+.es-listItemView-level1 {
+ margin-left: 2em;
+}
+
+.es-listItemView-level2 {
+ margin-left: 4em;
+}
+
+.es-listItemView-level3 {
+ margin-left: 6em;
+}
+
+.es-listItemView-level4 {
+ margin-left: 8em;
+}
+
+.es-listItemView-level5 {
+ margin-left: 10em;
+}
+
+.es-listItemView-level6 {
+ margin-left: 12em;
+}
+
+.es-listItemView-level1.es-listItemView-number {
+ margin-left: 4em;
+}
+
+.es-listItemView-level2.es-listItemView-number {
+ margin-left: 8em;
+}
+
+.es-listItemView-level3.es-listItemView-number {
+ margin-left: 12em;
+}
+
+.es-listItemView-level4.es-listItemView-number {
+ margin-left: 16em;
+}
+
+.es-listItemView-level5.es-listItemView-number {
+ margin-left: 18em;
+}
+
+.es-listItemView-level6.es-listItemView-number {
+ margin-left: 22em;
+}
Added: trunk/extensions/VisualEditor/contentEditable/styles/es.SurfaceView.css
===================================================================
--- trunk/extensions/VisualEditor/contentEditable/styles/es.SurfaceView.css
(rev 0)
+++ trunk/extensions/VisualEditor/contentEditable/styles/es.SurfaceView.css
2012-02-01 22:38:57 UTC (rev 110529)
@@ -0,0 +1,36 @@
+.es-surfaceView {
+ overflow: hidden;
+ font-size: 1em; /* to look more like MediaWiki use: 0.8em */;
+ margin-left: -1em;
+ margin-right: -1em;
+ /*
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ -o-user-select;
+ user-select: none;
+ */
+}
+
+.es-surfaceView-textarea {
+ position: absolute;
+ z-index: -1;
+ opacity: 0;
+ color: white;
+ background-color: white;
+ border: none;
+ padding: 0;
+ margin: 0;
+ width: 1px;
+}
+
+.es-surfaceView-textarea:focus {
+ outline: none;
+}
+
+.es-surfaceView-cursor {
+ position: absolute;
+ background-color: black;
+ width: 1px;
+ display: none;
+}
Modified: trunk/extensions/VisualEditor/contentEditable/views/es.SurfaceView.js
===================================================================
--- trunk/extensions/VisualEditor/contentEditable/views/es.SurfaceView.js
2012-02-01 22:28:39 UTC (rev 110528)
+++ trunk/extensions/VisualEditor/contentEditable/views/es.SurfaceView.js
2012-02-01 22:38:57 UTC (rev 110529)
@@ -8,8 +8,10 @@
// Properties
this.model = model;
this.documentView = new es.DocumentView( this.model.getDocument(), this
);
- this.$ = $container.append( this.documentView.$ );
-
+ this.$ = $container
+ .addClass( 'es-surfaceView' )
+ .append( this.documentView.$ );
+
this.$.keydown( function(e) {
return _this.onKeyDown( e );
} );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
