[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Replaced "jquery.wikiEditor" with "ext.wikiEditor" in depend...

2017-11-27 Thread Yaron Koren (Code Review) 
Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393608 )

Change subject: Replaced "jquery.wikiEditor" with "ext.wikiEditor" in 
dependencies
..


Replaced "jquery.wikiEditor" with "ext.wikiEditor" in dependencies

Were the package names changed in the WikiEditor extension at some point?

Change-Id: I9f5713c78362c302c5718ed8cf2279ae67f155eb
---
M includes/PF_Hooks.php
M includes/forminputs/PF_TextAreaInput.php
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Yaron Koren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/PF_Hooks.php b/includes/PF_Hooks.php
index 4f7186f..5ba4b8d 100644
--- a/includes/PF_Hooks.php
+++ b/includes/PF_Hooks.php
@@ -80,7 +80,7 @@
'styles' => '/skins/PF_wikieditor.css',
'dependencies' => array(
'ext.pageforms.main',
-   'jquery.wikiEditor'
+   'ext.wikiEditor'
),
),
) );
diff --git a/includes/forminputs/PF_TextAreaInput.php 
b/includes/forminputs/PF_TextAreaInput.php
index 3cdf39c..14be782 100644
--- a/includes/forminputs/PF_TextAreaInput.php
+++ b/includes/forminputs/PF_TextAreaInput.php
@@ -50,7 +50,7 @@
if (
array_key_exists( 'editor', $this->mOtherArgs ) &&
$this->mOtherArgs['editor'] == 'wikieditor' &&
-   in_array( 'jquery.wikiEditor', 
$wgOut->getResourceLoader()->getModuleNames() ) &&
+   in_array( 'ext.wikiEditor', 
$wgOut->getResourceLoader()->getModuleNames() ) &&
class_exists( 'WikiEditorHooks' )
) {
$this->mEditor = 'wikieditor';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f5713c78362c302c5718ed8cf2279ae67f155eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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...PageForms[master]: Replaced "jquery.wikiEditor" with "ext.wikiEditor" in depend...

2017-11-27 Thread Yaron Koren (Code Review) 
Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393608 )

Change subject: Replaced "jquery.wikiEditor" with "ext.wikiEditor" in 
dependencies
..

Replaced "jquery.wikiEditor" with "ext.wikiEditor" in dependencies

Were the package names changed in the WikiEditor extension at some point?

Change-Id: I9f5713c78362c302c5718ed8cf2279ae67f155eb
---
M includes/PF_Hooks.php
M includes/forminputs/PF_TextAreaInput.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/08/393608/2

diff --git a/includes/PF_Hooks.php b/includes/PF_Hooks.php
index 4f7186f..5ba4b8d 100644
--- a/includes/PF_Hooks.php
+++ b/includes/PF_Hooks.php
@@ -80,7 +80,7 @@
'styles' => '/skins/PF_wikieditor.css',
'dependencies' => array(
'ext.pageforms.main',
-   'jquery.wikiEditor'
+   'ext.wikiEditor'
),
),
) );
diff --git a/includes/forminputs/PF_TextAreaInput.php 
b/includes/forminputs/PF_TextAreaInput.php
index 3cdf39c..14be782 100644
--- a/includes/forminputs/PF_TextAreaInput.php
+++ b/includes/forminputs/PF_TextAreaInput.php
@@ -50,7 +50,7 @@
if (
array_key_exists( 'editor', $this->mOtherArgs ) &&
$this->mOtherArgs['editor'] == 'wikieditor' &&
-   in_array( 'jquery.wikiEditor', 
$wgOut->getResourceLoader()->getModuleNames() ) &&
+   in_array( 'ext.wikiEditor', 
$wgOut->getResourceLoader()->getModuleNames() ) &&
class_exists( 'WikiEditorHooks' )
) {
$this->mEditor = 'wikieditor';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f5713c78362c302c5718ed8cf2279ae67f155eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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