Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225648
Change subject: [BREAKING CHANGE] Rename SurfaceWidget to TargetWidget
......................................................................
[BREAKING CHANGE] Rename SurfaceWidget to TargetWidget
Bug: T94066
Change-Id: Ib019df8bd55b844f1ee381def0c27d5b3f9002fd
---
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
M src/themes/apex/widgets.css
M src/themes/mediawiki/widgets.css
D src/ui/styles/widgets/ve.ui.SurfaceWidget.css
A src/ui/styles/widgets/ve.ui.TargetWidget.css
R src/ui/widgets/ve.ui.TargetWidget.js
M tests/index.html
9 files changed, 43 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/48/225648/1
diff --git a/build/modules.json b/build/modules.json
index 7d9a397..daebcce 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -428,7 +428,7 @@
"src/ui/widgets/ve.ui.LanguageResultWidget.js",
"src/ui/dialogs/ve.ui.LanguageSearchDialog.js",
"src/ui/widgets/ve.ui.LanguageInputWidget.js",
- "src/ui/widgets/ve.ui.SurfaceWidget.js",
+ "src/ui/widgets/ve.ui.TargetWidget.js",
"src/ui/widgets/ve.ui.LinkAnnotationWidget.js",
"src/ui/widgets/ve.ui.ContextSelectWidget.js",
"src/ui/widgets/ve.ui.ContextOptionWidget.js",
@@ -492,7 +492,7 @@
"src/ui/styles/contextitems/ve.ui.TableContextItem.css",
"src/ui/styles/ve.ui.Overlay.css",
"src/ui/styles/ve.ui.Surface.css",
- "src/ui/styles/widgets/ve.ui.SurfaceWidget.css",
+ "src/ui/styles/widgets/ve.ui.TargetWidget.css",
"src/ui/styles/ve.ui.TableContext.css",
"src/ui/styles/ve.ui.Toolbar.css"
],
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index 008a26c..2652f23 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -64,7 +64,7 @@
<link rel=stylesheet
href="../../src/ui/styles/contextitems/ve.ui.TableContextItem.css"
class="stylesheet-ve">
<link rel=stylesheet
href="../../src/ui/styles/ve.ui.Overlay.css" class="stylesheet-ve">
<link rel=stylesheet
href="../../src/ui/styles/ve.ui.Surface.css" class="stylesheet-ve">
- <link rel=stylesheet
href="../../src/ui/styles/widgets/ve.ui.SurfaceWidget.css"
class="stylesheet-ve">
+ <link rel=stylesheet
href="../../src/ui/styles/widgets/ve.ui.TargetWidget.css" class="stylesheet-ve">
<link rel=stylesheet
href="../../src/ui/styles/ve.ui.TableContext.css" class="stylesheet-ve">
<link rel=stylesheet
href="../../src/ui/styles/ve.ui.Toolbar.css" class="stylesheet-ve">
@@ -389,7 +389,7 @@
<script
src="../../src/ui/widgets/ve.ui.LanguageResultWidget.js"></script>
<script
src="../../src/ui/dialogs/ve.ui.LanguageSearchDialog.js"></script>
<script
src="../../src/ui/widgets/ve.ui.LanguageInputWidget.js"></script>
- <script
src="../../src/ui/widgets/ve.ui.SurfaceWidget.js"></script>
+ <script
src="../../src/ui/widgets/ve.ui.TargetWidget.js"></script>
<script
src="../../src/ui/widgets/ve.ui.LinkAnnotationWidget.js"></script>
<script
src="../../src/ui/widgets/ve.ui.ContextSelectWidget.js"></script>
<script
src="../../src/ui/widgets/ve.ui.ContextOptionWidget.js"></script>
diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index d9d0b2a..b79ad53 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -64,7 +64,7 @@
<link rel=stylesheet
href="../../src/ui/styles/contextitems/ve.ui.TableContextItem.css"
class="stylesheet-ve">
<link rel=stylesheet
href="../../src/ui/styles/ve.ui.Overlay.css" class="stylesheet-ve">
<link rel=stylesheet
href="../../src/ui/styles/ve.ui.Surface.css" class="stylesheet-ve">
- <link rel=stylesheet
href="../../src/ui/styles/widgets/ve.ui.SurfaceWidget.css"
class="stylesheet-ve">
+ <link rel=stylesheet
href="../../src/ui/styles/widgets/ve.ui.TargetWidget.css" class="stylesheet-ve">
<link rel=stylesheet
href="../../src/ui/styles/ve.ui.TableContext.css" class="stylesheet-ve">
<link rel=stylesheet
href="../../src/ui/styles/ve.ui.Toolbar.css" class="stylesheet-ve">
@@ -390,7 +390,7 @@
<script
src="../../src/ui/widgets/ve.ui.LanguageResultWidget.js"></script>
<script
src="../../src/ui/dialogs/ve.ui.LanguageSearchDialog.js"></script>
<script
src="../../src/ui/widgets/ve.ui.LanguageInputWidget.js"></script>
- <script
src="../../src/ui/widgets/ve.ui.SurfaceWidget.js"></script>
+ <script
src="../../src/ui/widgets/ve.ui.TargetWidget.js"></script>
<script
src="../../src/ui/widgets/ve.ui.LinkAnnotationWidget.js"></script>
<script
src="../../src/ui/widgets/ve.ui.ContextSelectWidget.js"></script>
<script
src="../../src/ui/widgets/ve.ui.ContextOptionWidget.js"></script>
diff --git a/src/themes/apex/widgets.css b/src/themes/apex/widgets.css
index 5c426c9..d5c9626 100644
--- a/src/themes/apex/widgets.css
+++ b/src/themes/apex/widgets.css
@@ -4,17 +4,17 @@
* @copyright 2011-2015 VisualEditor Team and others; see
http://ve.mit-license.org
*/
-/* ve.ui.SurfaceWidget */
+/* ve.ui.TargetWidget */
-.ve-ui-surfaceWidget {
+.ve-ui-targetWidget {
border: 1px solid #ccc;
border-radius: 0.25em;
}
-.ve-ui-surfaceWidget > .ve-ui-surface {
+.ve-ui-targetWidget > .ve-ui-surface {
border-bottom: 1px solid #ccc;
}
-.ve-ui-surfaceWidget > :last-child {
+.ve-ui-targetWidget > :last-child {
border-bottom: none;
}
diff --git a/src/themes/mediawiki/widgets.css b/src/themes/mediawiki/widgets.css
index 754e523..1187620 100644
--- a/src/themes/mediawiki/widgets.css
+++ b/src/themes/mediawiki/widgets.css
@@ -4,13 +4,13 @@
* @copyright 2011-2015 VisualEditor Team and others; see
http://ve.mit-license.org
*/
-/* ve.ui.SurfaceWidget */
+/* ve.ui.TargetWidget */
-.ve-ui-surfaceWidget {
+.ve-ui-targetWidget {
border: 1px solid #ccc;
}
-.ve-ui-surfaceWidget > :last-child {
+.ve-ui-targetWidget > :last-child {
border-bottom: none;
}
diff --git a/src/ui/styles/widgets/ve.ui.SurfaceWidget.css
b/src/ui/styles/widgets/ve.ui.SurfaceWidget.css
deleted file mode 100644
index 0e90f8c..0000000
--- a/src/ui/styles/widgets/ve.ui.SurfaceWidget.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * VisualEditor UserInterface SurfaceWidget styles.
- *
- * @copyright 2011-2015 VisualEditor Team and others; see
http://ve.mit-license.org
- */
-
-.ve-ui-surfaceWidget .ve-ce-documentNode,
-.ve-ui-surfaceWidget .ve-ui-surface-placeholder {
- /* Surface default padding is 0.75, 1.5. Use 0.5, 1 for the widget */
- /* 0.5/0.8, 1/0.8 */
- padding: 0.625em 1.25em;
-}
-
-.ve-ui-surfaceWidget .ve-ui-debugBar {
- padding: 1em;
-}
diff --git a/src/ui/styles/widgets/ve.ui.TargetWidget.css
b/src/ui/styles/widgets/ve.ui.TargetWidget.css
new file mode 100644
index 0000000..e7ad9ca
--- /dev/null
+++ b/src/ui/styles/widgets/ve.ui.TargetWidget.css
@@ -0,0 +1,16 @@
+/*!
+ * VisualEditor UserInterface targetWidget styles.
+ *
+ * @copyright 2011-2015 VisualEditor Team and others; see
http://ve.mit-license.org
+ */
+
+.ve-ui-targetWidget .ve-ce-documentNode,
+.ve-ui-targetWidget .ve-ui-target-placeholder {
+ /* target default padding is 0.75, 1.5. Use 0.5, 1 for the widget */
+ /* 0.5/0.8, 1/0.8 */
+ padding: 0.625em 1.25em;
+}
+
+.ve-ui-targetWidget .ve-ui-debugBar {
+ padding: 1em;
+}
diff --git a/src/ui/widgets/ve.ui.SurfaceWidget.js
b/src/ui/widgets/ve.ui.TargetWidget.js
similarity index 72%
rename from src/ui/widgets/ve.ui.SurfaceWidget.js
rename to src/ui/widgets/ve.ui.TargetWidget.js
index 84473e1..d46b5c1 100644
--- a/src/ui/widgets/ve.ui.SurfaceWidget.js
+++ b/src/ui/widgets/ve.ui.TargetWidget.js
@@ -1,11 +1,11 @@
/*!
- * VisualEditor UserInterface SurfaceWidget class.
+ * VisualEditor UserInterface TargetWidget class.
*
* @copyright 2011-2015 VisualEditor Team and others; see
http://ve.mit-license.org
*/
/**
- * Creates an ve.ui.SurfaceWidget object.
+ * Creates an ve.ui.TargetWidget object.
*
* @class
* @abstract
@@ -19,7 +19,7 @@
* @cfg {Object} [importRules] Import rules
* @cfg {string} [inDialog] The name of the dialog this surface widget is in
*/
-ve.ui.SurfaceWidget = function VeUiSurfaceWidget( doc, config ) {
+ve.ui.TargetWidget = function VeUiTargetWidget( doc, config ) {
// Config initialization
config = config || {};
@@ -35,11 +35,11 @@
this.toolbar = new ve.ui.Toolbar();
// Initialization
- this.surface.$element.addClass( 've-ui-surfaceWidget-surface' );
- this.toolbar.$element.addClass( 've-ui-surfaceWidget-toolbar' );
+ this.surface.$element.addClass( 've-ui-targetWidget-surface' );
+ this.toolbar.$element.addClass( 've-ui-targetWidget-toolbar' );
this.toolbar.$bar.append( this.surface.getToolbarDialogs().$element );
this.$element
- .addClass( 've-ui-surfaceWidget' )
+ .addClass( 've-ui-targetWidget' )
.append( this.toolbar.$element, this.surface.$element );
if ( config.tools ) {
this.toolbar.setup( config.tools, this.surface );
@@ -48,7 +48,7 @@
/* Inheritance */
-OO.inheritClass( ve.ui.SurfaceWidget, OO.ui.Widget );
+OO.inheritClass( ve.ui.TargetWidget, OO.ui.Widget );
/* Methods */
@@ -58,7 +58,7 @@
* @method
* @returns {ve.ui.Surface} Surface
*/
-ve.ui.SurfaceWidget.prototype.getSurface = function () {
+ve.ui.TargetWidget.prototype.getSurface = function () {
return this.surface;
};
@@ -68,7 +68,7 @@
* @method
* @returns {OO.ui.Toolbar} Toolbar
*/
-ve.ui.SurfaceWidget.prototype.getToolbar = function () {
+ve.ui.TargetWidget.prototype.getToolbar = function () {
return this.toolbar;
};
@@ -78,7 +78,7 @@
* @method
* @returns {ve.dm.ElementLinearData} Content data
*/
-ve.ui.SurfaceWidget.prototype.getContent = function () {
+ve.ui.TargetWidget.prototype.getContent = function () {
return this.surface.getModel().getDocument().getData();
};
@@ -89,7 +89,7 @@
*
* @method
*/
-ve.ui.SurfaceWidget.prototype.initialize = function () {
+ve.ui.TargetWidget.prototype.initialize = function () {
this.toolbar.initialize();
this.surface.initialize();
};
@@ -99,7 +99,7 @@
*
* @method
*/
-ve.ui.SurfaceWidget.prototype.destroy = function () {
+ve.ui.TargetWidget.prototype.destroy = function () {
if ( this.surface ) {
this.surface.destroy();
}
@@ -112,6 +112,6 @@
/**
* Focus the surface.
*/
-ve.ui.SurfaceWidget.prototype.focus = function () {
+ve.ui.TargetWidget.prototype.focus = function () {
this.surface.getView().focus();
};
diff --git a/tests/index.html b/tests/index.html
index b54e327..4cb7741 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -318,7 +318,7 @@
<script
src="../src/ui/widgets/ve.ui.LanguageResultWidget.js"></script>
<script
src="../src/ui/dialogs/ve.ui.LanguageSearchDialog.js"></script>
<script
src="../src/ui/widgets/ve.ui.LanguageInputWidget.js"></script>
- <script src="../src/ui/widgets/ve.ui.SurfaceWidget.js"></script>
+ <script src="../src/ui/widgets/ve.ui.TargetWidget.js"></script>
<script
src="../src/ui/widgets/ve.ui.LinkAnnotationWidget.js"></script>
<script
src="../src/ui/widgets/ve.ui.ContextSelectWidget.js"></script>
<script
src="../src/ui/widgets/ve.ui.ContextOptionWidget.js"></script>
--
To view, visit https://gerrit.wikimedia.org/r/225648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib019df8bd55b844f1ee381def0c27d5b3f9002fd
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
