jenkins-bot has submitted this change and it was merged.
Change subject: Separated the OKFN modules to mediawiki.libs.okfn/
......................................................................
Separated the OKFN modules to mediawiki.libs.okfn/
I have created a separate module for mediawiki.libs.okfn and include it as a
dependency in ext.annotator but there is some problem, the annotator is not
being loaded.
Change-Id: I5b93f5fa9028bbcb7091f5f1ab2cf610b0f0e418
---
M Annotator.php
R modules/mediawiki.libs.okfn/Annotator-full.js
R modules/mediawiki.libs.okfn/Annotator.css
3 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Annotator.php b/Annotator.php
index b5ca254..7aa2849 100755
--- a/Annotator.php
+++ b/Annotator.php
@@ -11,12 +11,14 @@
'localBasePath' => __DIR__ . '/modules',
'remoteExtPath' => "Annotator/modules",
);
+
+$wgResourceModules['mediawiki.libs.okfn'] = array(
+ 'scripts' => 'mediawiki.libs.okfn/Annotator-full.js',
+ 'styles' => 'mediawiki.libs.okfn/Annotator.css',
+ ) + $wgAnnotatorResourcePaths;
$wgResourceModules['ext.annotator'] = array(
- 'scripts' => array(
- 'Annotator-full.js',
- 'Annotator.js',
- ),
- 'styles' => 'Annotator.css',
+ 'scripts' => 'Annotator.js',
+ 'dependencies' => 'mediawiki.libs.okfn',
) + $wgAnnotatorResourcePaths;
//Autoloading
@@ -27,4 +29,4 @@
$wgHooks['BeforePageDisplay'][] = 'AnnotatorHooks::onBeforePageDisplay';
$wgHooks['LoadExtensionSchemaUpdates'][] =
'AnnotatorHooks::loadExtensionSchemaUpdates';
-$wgAPIModules['annotator-create'] = 'ApiAnnotatorCreate';
\ No newline at end of file
+$wgAPIModules['annotator-create'] = 'ApiAnnotatorCreate';
diff --git a/modules/Annotator-full.js
b/modules/mediawiki.libs.okfn/Annotator-full.js
similarity index 100%
rename from modules/Annotator-full.js
rename to modules/mediawiki.libs.okfn/Annotator-full.js
diff --git a/modules/Annotator.css b/modules/mediawiki.libs.okfn/Annotator.css
similarity index 100%
rename from modules/Annotator.css
rename to modules/mediawiki.libs.okfn/Annotator.css
--
To view, visit https://gerrit.wikimedia.org/r/73612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b93f5fa9028bbcb7091f5f1ab2cf610b0f0e418
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Annotator
Gerrit-Branch: master
Gerrit-Owner: Rjain <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
