[MediaWiki-commits] [Gerrit] Unbreak tests - change (mediawiki...SemanticForms)

2015-05-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Unbreak tests
..


Unbreak tests

Only register ext.semanticforms.wikieditor module if WikiEditor extension is
available, by deferring the module registration to a
ResourceLoaderRegisterModules hook handler.

Change-Id: I0bab58c80cd769c434cc8ade4507d5e4c2543dd9
---
M SemanticForms.php
M includes/SF_Utils.php
2 files changed, 28 insertions(+), 8 deletions(-)

Approvals:
  Legoktm: Looks good to me, but someone else must approve
  Yaron Koren: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SemanticForms.php b/SemanticForms.php
index 97faf58..afba110 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -111,6 +111,7 @@
 $GLOBALS['wgHooks']['EditPage::importFormData'][] = 'SFUtils::showFormPreview';
 $GLOBALS['wgHooks']['CanonicalNamespaces'][] = 'SFUtils::registerNamespaces';
 $GLOBALS['wgHooks']['UnitTestsList'][] = 'SFUtils::onUnitTestsList';
+$GLOBALS['wgHooks']['ResourceLoaderRegisterModules'][] = 
'SFUtils::registerModules';
 
 // Admin Links hook needs to be called in a delayed way so that it
 // will always be called after SMW's Admin Links addition; as of
@@ -302,14 +303,6 @@
'ext.semanticforms.collapsible' = $sfgResourceTemplate + array(
'scripts' = 'libs/SF_collapsible.js',
'styles' = 'skins/SF_collapsible.css',
-   ),
-   'ext.semanticforms.wikieditor' = $sfgResourceTemplate + array(
-   'scripts' = 'libs/SF_wikieditor.js',
-   'styles' = 'skins/SF_wikieditor.css',
-   'dependencies' = array(
-   'ext.semanticforms.main',
-   'jquery.wikiEditor',
-   ),
),
'ext.semanticforms.imagepreview' = $sfgResourceTemplate + 
array(
'scripts' = 'libs/SF_imagePreview.js',
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 9bf529d..5fc6d32 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -1179,6 +1179,33 @@
}
 
/**
+* ResourceLoaderRegisterModules hook handler
+*
+* @see 
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderRegisterModules
+*
+* @param ResourceLoader $resourceLoader The ResourceLoader object
+* @return bool Always true
+*/
+   public static function registerModules( ResourceLoader $resourceLoader 
) {
+   if ( class_exists( 'WikiEditorHooks' ) ) {
+   $resourceLoader-register( array(
+   'ext.semanticforms.wikieditor' = array(
+   'localBasePath' = __DIR__ . '/..',
+   'remoteExtPath' = 'SemanticForms',
+   'scripts' = 'libs/SF_wikieditor.js',
+   'styles' = 'skins/SF_wikieditor.css',
+   'dependencies' = array(
+   'ext.semanticforms.main',
+   'jquery.wikiEditor',
+   ),
+   ),
+   ) );
+   }
+
+   return true;
+   }
+
+   /**
 * Register the namespaces for Semantic Forms.
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/CanonicalNamespaces
 *

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bab58c80cd769c434cc8ade4507d5e4c2543dd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Unbreak tests - change (mediawiki...SemanticForms)

2015-05-28 Thread Ori.livneh (Code Review) 
Ori.livneh has uploaded a new change for review.

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

Change subject: Unbreak tests
..

Unbreak tests

Only register ext.semanticforms.wikieditor module if WikiEditor extension is
available, by deferring the module registration to a
ResourceLoaderRegisterModules hook handler.

Change-Id: I0bab58c80cd769c434cc8ade4507d5e4c2543dd9
---
M SemanticForms.php
M includes/SF_Utils.php
2 files changed, 28 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms 
refs/changes/00/214500/1

diff --git a/SemanticForms.php b/SemanticForms.php
index 97faf58..afba110 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -111,6 +111,7 @@
 $GLOBALS['wgHooks']['EditPage::importFormData'][] = 'SFUtils::showFormPreview';
 $GLOBALS['wgHooks']['CanonicalNamespaces'][] = 'SFUtils::registerNamespaces';
 $GLOBALS['wgHooks']['UnitTestsList'][] = 'SFUtils::onUnitTestsList';
+$GLOBALS['wgHooks']['ResourceLoaderRegisterModules'][] = 
'SFUtils::registerModules';
 
 // Admin Links hook needs to be called in a delayed way so that it
 // will always be called after SMW's Admin Links addition; as of
@@ -302,14 +303,6 @@
'ext.semanticforms.collapsible' = $sfgResourceTemplate + array(
'scripts' = 'libs/SF_collapsible.js',
'styles' = 'skins/SF_collapsible.css',
-   ),
-   'ext.semanticforms.wikieditor' = $sfgResourceTemplate + array(
-   'scripts' = 'libs/SF_wikieditor.js',
-   'styles' = 'skins/SF_wikieditor.css',
-   'dependencies' = array(
-   'ext.semanticforms.main',
-   'jquery.wikiEditor',
-   ),
),
'ext.semanticforms.imagepreview' = $sfgResourceTemplate + 
array(
'scripts' = 'libs/SF_imagePreview.js',
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 9bf529d..5fc6d32 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -1179,6 +1179,33 @@
}
 
/**
+* ResourceLoaderRegisterModules hook handler
+*
+* @see 
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderRegisterModules
+*
+* @param ResourceLoader $resourceLoader The ResourceLoader object
+* @return bool Always true
+*/
+   public static function registerModules( ResourceLoader $resourceLoader 
) {
+   if ( class_exists( 'WikiEditorHooks' ) ) {
+   $resourceLoader-register( array(
+   'ext.semanticforms.wikieditor' = array(
+   'localBasePath' = __DIR__ . '/..',
+   'remoteExtPath' = 'SemanticForms',
+   'scripts' = 'libs/SF_wikieditor.js',
+   'styles' = 'skins/SF_wikieditor.css',
+   'dependencies' = array(
+   'ext.semanticforms.main',
+   'jquery.wikiEditor',
+   ),
+   ),
+   ) );
+   }
+
+   return true;
+   }
+
+   /**
 * Register the namespaces for Semantic Forms.
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/CanonicalNamespaces
 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bab58c80cd769c434cc8ade4507d5e4c2543dd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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