[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Follow-up I9547dfd: Only enable VE tabs if VE is available

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

Change subject: Follow-up I9547dfd: Only enable VE tabs if VE is available
..


Follow-up I9547dfd: Only enable VE tabs if VE is available

Otherwise VE is launched on namespaces where it is disabled
(but NWE is enabled).

Bug: T147890
Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alex Monk: Looks good to me, approved
  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 bcd39b4..41cfd7b 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
@@ -970,7 +970,7 @@
if ( !conf.singleEditTab || tabPreference === 
'multi-tab' ) {
// … set the skin up with both tabs and 
both section edit links.
init.setupSkin();
-   } else if ( pageCanLoadVE && onlyTabIsVE ) {
+   } else if ( init.isVisualAvailable && 
pageCanLoadVE && onlyTabIsVE ) {
// … on single-edit-tab wikis, where VE 
is the user's preferred editor
// Handle section edit link clicks
$( '.mw-editsection a' ).on( 'click', 
function ( e ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Alex Monk 
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]: Follow-up I9547dfd: Only enable VE tabs if VE is available

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

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

Change subject: Follow-up I9547dfd: Only enable VE tabs if VE is available
..

Follow-up I9547dfd: Only enable VE tabs if VE is available

Otherwise VE is launched on namespaces it is disabled (but NWE is enabled).

Bug: T147890
Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/20/315420/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 bcd39b4..41cfd7b 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
@@ -970,7 +970,7 @@
if ( !conf.singleEditTab || tabPreference === 
'multi-tab' ) {
// … set the skin up with both tabs and 
both section edit links.
init.setupSkin();
-   } else if ( pageCanLoadVE && onlyTabIsVE ) {
+   } else if ( init.isVisualAvailable && 
pageCanLoadVE && onlyTabIsVE ) {
// … on single-edit-tab wikis, where VE 
is the user's preferred editor
// Handle section edit link clicks
$( '.mw-editsection a' ).on( 'click', 
function ( e ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
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