[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Rename methods used for setting up multiple edit tabs

2016-11-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Rename methods used for setting up multiple edit tabs
..


Rename methods used for setting up multiple edit tabs

Change-Id: I71d6dd0848e9cc3ee8531b0b914c29219b4697bd
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  Jforrester: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 553d3e9..50d3c29 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -395,12 +395,12 @@
plugins.push( plugin );
},
 
-   setupSkin: function () {
-   init.setupTabs();
-   init.setupSectionLinks();
+   setupMultiTabSkin: function () {
+   init.setupMultiTabs();
+   init.setupMultiSectionLinks();
},
 
-   setupTabs: function () {
+   setupMultiTabs: function () {
var caVeEdit,
action = pageExists ? 'edit' : 'create',
pTabsId = $( '#p-views' ).length ? 'p-views' : 
'p-cactions',
@@ -498,7 +498,7 @@
}
},
 
-   setupSectionLinks: function () {
+   setupMultiSectionLinks: function () {
var $editsections = $( '#mw-content-text 
.mw-editsection' ),
bodyDir = $( 'body' ).css( 'direction' );
 
@@ -1008,7 +1008,7 @@
// … on two-edit-tab wikis, or single-edit-tab 
wikis, where the user wants both …
if ( !conf.singleEditTab || tabPreference === 
'multi-tab' ) {
// … set the skin up with both tabs and 
both section edit links.
-   init.setupSkin();
+   init.setupMultiTabSkin();
} else if (
pageCanLoadEditor && (
( init.isVisualAvailable && 
isOnlyTabVE() ) ||

-- 
To view, visit https://gerrit.wikimedia.org/r/320383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I71d6dd0848e9cc3ee8531b0b914c29219b4697bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Rename methods used for setting up multiple edit tabs

2016-11-08 Thread Esanders (Code Review) 
Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320383

Change subject: Rename methods used for setting up multiple edit tabs
..

Rename methods used for setting up multiple edit tabs

Change-Id: I71d6dd0848e9cc3ee8531b0b914c29219b4697bd
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/83/320383/1

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 553d3e9..50d3c29 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -395,12 +395,12 @@
plugins.push( plugin );
},
 
-   setupSkin: function () {
-   init.setupTabs();
-   init.setupSectionLinks();
+   setupMultiTabSkin: function () {
+   init.setupMultiTabs();
+   init.setupMultiSectionLinks();
},
 
-   setupTabs: function () {
+   setupMultiTabs: function () {
var caVeEdit,
action = pageExists ? 'edit' : 'create',
pTabsId = $( '#p-views' ).length ? 'p-views' : 
'p-cactions',
@@ -498,7 +498,7 @@
}
},
 
-   setupSectionLinks: function () {
+   setupMultiSectionLinks: function () {
var $editsections = $( '#mw-content-text 
.mw-editsection' ),
bodyDir = $( 'body' ).css( 'direction' );
 
@@ -1008,7 +1008,7 @@
// … on two-edit-tab wikis, or single-edit-tab 
wikis, where the user wants both …
if ( !conf.singleEditTab || tabPreference === 
'multi-tab' ) {
// … set the skin up with both tabs and 
both section edit links.
-   init.setupSkin();
+   init.setupMultiTabSkin();
} else if (
pageCanLoadEditor && (
( init.isVisualAvailable && 
isOnlyTabVE() ) ||

-- 
To view, visit https://gerrit.wikimedia.org/r/320383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71d6dd0848e9cc3ee8531b0b914c29219b4697bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits