Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/204942
Change subject: Create RTL version of minimal demo
......................................................................
Create RTL version of minimal demo
Change-Id: I79f33e9e38260ea76a9144d6e17a8ae9b998ff5a
---
M Gruntfile.js
M build/tasks/buildloader.js
M demos/ve/demo.minimal.js
A demos/ve/minimal-rtl.html
M demos/ve/minimal.html
M demos/ve/minimal.html.template
6 files changed, 107 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/42/204942/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 7fa6183..b37ed7c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -128,7 +128,7 @@
pathPrefix: '../',
i18n: [ 'i18n/', 'lib/oojs-ui/i18n/' ],
indent: '\t\t',
- bidi: false
+ dir: 'ltr'
},
desktopDemo: {
targetFile: 'demos/ve/desktop.html',
@@ -204,7 +204,22 @@
pathPrefix: '../../',
i18n: [ 'dist/i18n/', 'lib/oojs-ui/i18n/' ],
indent: '\t\t',
- bidi: false,
+ dir: 'ltr',
+ langList: false
+ },
+ minimalDemoRtl: {
+ targetFile: 'demos/ve/minimal-rtl.html',
+ template: 'demos/ve/minimal.html.template',
+ modules: modules,
+ load: [
+ 'visualEditor.standalone.apex.dist',
+ 'visualEditor.standalone.read'
+ ],
+ run: [ 'visualEditor.minimal.standalone.demo' ],
+ pathPrefix: '../../',
+ i18n: [ 'dist/i18n/', 'lib/oojs-ui/i18n/' ],
+ indent: '\t\t',
+ dir: 'rtl',
langList: false
},
test: {
diff --git a/build/tasks/buildloader.js b/build/tasks/buildloader.js
index 84d398f..117eefb 100644
--- a/build/tasks/buildloader.js
+++ b/build/tasks/buildloader.js
@@ -19,7 +19,7 @@
run = this.data.run || [],
env = this.data.env || {},
placeholders = this.data.placeholders || {},
- bidi = this.data.bidi !== undefined ? this.data.bidi :
true,
+ dir = this.data.dir,
langList = this.data.langList !== undefined ?
this.data.langList : true,
text = grunt.file.read( this.data.template ),
done = this.async(),
@@ -32,11 +32,16 @@
function styleTag( group, src ) {
var rtlFilepath = src.file.replace( /\.css$/,
'.rtl.css' );
- if ( bidi && grunt.file.exists( rtlFilepath ) ) {
- return indent + '<link rel=stylesheet href="' +
pathPrefix + src.file + '" class="stylesheet-ltr' +
- ( group ? ' stylesheet-' + group : '' )
+ '">\n' +
- indent + '<link rel=stylesheet href="'
+ pathPrefix + rtlFilepath + '" class="stylesheet-rtl' +
- ( group ? ' stylesheet-' + group : '' )
+ '">';
+ if ( grunt.file.exists( rtlFilepath ) ) {
+ if ( !dir ) {
+ return indent + '<link rel=stylesheet
href="' + pathPrefix + src.file + '" class="stylesheet-ltr' +
+ ( group ? ' stylesheet-' +
group : '' ) + '">\n' +
+ indent + '<link rel=stylesheet
href="' + pathPrefix + rtlFilepath + '" class="stylesheet-rtl' +
+ ( group ? ' stylesheet-' +
group : '' ) + '">';
+ } else if ( dir === 'rtl' ) {
+ return indent + '<link rel=stylesheet
href="' + pathPrefix + rtlFilepath + '"' +
+ ( group ? ' class="stylesheet-'
+ group + '"' : '' ) + '>';
+ }
}
return indent + '<link rel=stylesheet href="' +
pathPrefix + src.file + '"' +
( group ? ' class="stylesheet-' + group + '"' :
'' ) + '>';
@@ -129,6 +134,7 @@
placeholders.styles = styles.join( '\n\n' );
placeholders.scripts = scripts.join( '\n\n' );
+ placeholders.dir = dir;
grunt.util.async.forEachSeries(
Object.keys( placeholders ),
diff --git a/demos/ve/demo.minimal.js b/demos/ve/demo.minimal.js
index 3cec76f..93f3d52 100644
--- a/demos/ve/demo.minimal.js
+++ b/demos/ve/demo.minimal.js
@@ -13,8 +13,9 @@
// Create a document model for a new surface
target.addSurface(
ve.dm.converter.getModelFromDom(
- ve.createDocumentFromHtml( '<p><b>Hello,</b>
<i>World!</i></p>' )
+ ve.createDocumentFromHtml( '<p><b>Hello,</b>
<i>World!</i></p>' ),
// Optional: Document language, directionality (ltr/rtl)
+ { lang: $.i18n().locale, dir: $( 'body' ).css(
'direction' ) }
)
);
diff --git a/demos/ve/minimal-rtl.html b/demos/ve/minimal-rtl.html
new file mode 100644
index 0000000..3dcae7b
--- /dev/null
+++ b/demos/ve/minimal-rtl.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html>
+ <!--
+ /*!
+ * VisualEditor minimal demo
+ *
+ * @copyright 2011-2015 VisualEditor Team and others; see
http://ve.mit-license.org
+ */
+ -->
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="initial-scale=1.0,
user-scalable=no" />
+ <title>VisualEditor Standalone Demo</title>
+
+ <!-- oojs-ui-apex -->
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex.vector.rtl.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.rtl.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.rtl.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.rtl.css">
+ <link rel=stylesheet
href="../../lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.rtl.css">
+
+ <!-- visualEditor.dist.apex -->
+ <link rel=stylesheet
href="../../dist/visualEditor-apex.rtl.css" class="stylesheet-ve">
+
+ <!-- visualEditor.standalone.read -->
+ <link rel=stylesheet
href="../../src/init/sa/styles/ve.init.sa.css" class="stylesheet-read">
+
+ <!-- visualEditor.minimal.standalone.demo -->
+ <link rel=stylesheet href="../../demos/ve/demo.minimal.css">
+
+ </head>
+ <body dir="rtl">
+ <div class="ve-instance"></div>
+ <div class="ve-demo-output">
+ <input type="button" class="ve-demo-convert"
value="↓ Convert to HTML">
+ <textarea class="ve-demo-html"></textarea>
+ </div>
+
+ <!-- jquery -->
+ <script src="../../lib/jquery/jquery.js"></script>
+
+ <!-- oojs -->
+ <script src="../../lib/oojs/oojs.jquery.js"></script>
+
+ <!-- oojs-ui -->
+ <script src="../../lib/oojs-ui/oojs-ui.js"></script>
+
+ <!-- jquery.i18n.dist -->
+ <script src="../../dist/lib/jquery.i18n.js"></script>
+
+ <!-- jquery.uls.data.dist -->
+ <script src="../../dist/lib/jquery.uls.data.js"></script>
+
+ <!-- jquery.client -->
+ <script src="../../lib/jquery.client/jquery.client.js"></script>
+
+ <!-- papaparse -->
+ <script src="../../lib/papaparse/papaparse.js"></script>
+
+ <!-- oojs-ui-apex -->
+ <script src="../../lib/oojs-ui/oojs-ui-apex.js"></script>
+
+ <!-- visualEditor.dist -->
+ <script src="../../dist/visualEditor.js"></script>
+
+ <script>
+ ve.messagePaths =
["../../dist/i18n/","../../lib/oojs-ui/i18n/"];
+ </script>
+
+ <!-- visualEditor.minimal.standalone.demo -->
+ <script src="../../demos/ve/demo.minimal.js"></script>
+
+ </body>
+</html>
diff --git a/demos/ve/minimal.html b/demos/ve/minimal.html
index dc547bd..b412a6f 100644
--- a/demos/ve/minimal.html
+++ b/demos/ve/minimal.html
@@ -29,7 +29,7 @@
<link rel=stylesheet href="../../demos/ve/demo.minimal.css">
</head>
- <body>
+ <body dir="ltr">
<div class="ve-instance"></div>
<div class="ve-demo-output">
<input type="button" class="ve-demo-convert"
value="↓ Convert to HTML">
diff --git a/demos/ve/minimal.html.template b/demos/ve/minimal.html.template
index ab2c32f..cc5e3a3 100644
--- a/demos/ve/minimal.html.template
+++ b/demos/ve/minimal.html.template
@@ -15,7 +15,7 @@
<!-- STYLES -->
</head>
- <body>
+ <body dir="<!-- DIR -->">
<div class="ve-instance"></div>
<div class="ve-demo-output">
<input type="button" class="ve-demo-convert"
value="↓ Convert to HTML">
--
To view, visit https://gerrit.wikimedia.org/r/204942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79f33e9e38260ea76a9144d6e17a8ae9b998ff5a
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
