Robert Vogel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393778 )
Change subject: BlueSpiceContextMenu: Change config
......................................................................
BlueSpiceContextMenu: Change config
Added config-data in extension.json.
Removed BsConfig::registerVar-methods in main-classes.
Added config-class.
Added Hook-path.
Change-Id: Iedb4ed355b37fd4961abc24e3bb4df3daf058711
---
M ContextMenu.class.php
M extension.json
M resources/bluespice.contextmenu.js
A src/Hook/GetPreferences/AddModus.php
4 files changed, 26 insertions(+), 18 deletions(-)
Approvals:
Pwirth: Verified; Looks good to me, approved
diff --git a/ContextMenu.class.php b/ContextMenu.class.php
index 35b8281..b808e86 100644
--- a/ContextMenu.class.php
+++ b/ContextMenu.class.php
@@ -39,23 +39,6 @@
*/
protected function initExt() {
$this->setHook('BeforePageDisplay');
-
- BsConfig::registerVar( 'MW::ContextMenu::Modus', 'ctrl',
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
'bs-contextmenu-pref-modus', 'radio' );
- }
-
- /**
- * Called by Preferences and UserPreferences
- * @param string $sAdapterName Name of the adapter. Probably MW.
- * @param BsConfig $oVariable The variable that is to be specified.
- * @return array Option array of specifications.
- */
- public function runPreferencePlugin( $sAdapterName, $oVariable ) {
- return array(
- 'options' => array(
- wfMessage(
'bs-contextmenu-pref-modus-ctrl-and-right-mouse' )->text() => 'ctrl',
- wfMessage(
'bs-contextmenu-pref-modus-just-right-mouse' )->text() => 'no-ctrl'
- ),
- );
}
/**
diff --git a/extension.json b/extension.json
index ae0c70d..1e3f272 100644
--- a/extension.json
+++ b/extension.json
@@ -20,11 +20,15 @@
"i18n"
]
},
+ "DefaultUserOptions": {
+ "bs-contextmenu-modus" : "ctrl"
+ },
"AutoloadClasses": {
"ContextMenu": "ContextMenu.class.php",
"BSApiContextMenuTasks":
"includes/api/BSApiContextMenuTasks.php"
},
"Hooks": {
+ "GetPreferences":
"\\BlueSpice\\ContextMenu\\Hook\\GetPreferences\\AddModule::callback",
"UnitTestsList": "ContextMenu::onUnitTestsList"
},
"APIModules": {
diff --git a/resources/bluespice.contextmenu.js
b/resources/bluespice.contextmenu.js
index f957589..1fb6721 100644
--- a/resources/bluespice.contextmenu.js
+++ b/resources/bluespice.contextmenu.js
@@ -23,7 +23,7 @@
return false;
};
- var modus = mw.user.options.get('MW::ContextMenu::Modus', 'ctrl');
+ var modus = mw.user.options.get( 'bs-contextmenu-modus', 'ctrl' );
$(document).on( 'contextmenu', 'a', function( e ) {
if( (modus === 'no-ctrl' && e.ctrlKey) || (modus === 'ctrl' &&
!e.ctrlKey) ) {
diff --git a/src/Hook/GetPreferences/AddModus.php
b/src/Hook/GetPreferences/AddModus.php
new file mode 100644
index 0000000..9cb51c0
--- /dev/null
+++ b/src/Hook/GetPreferences/AddModus.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace BlueSpice\ContextMenu\Hook\GetPreferences;
+
+use BlueSpice\Hook\GetPreferences;
+
+class AddModus extends GetPreferences {
+ protected function doProcess() {
+ $this->preferences['bs-contextmenu-modus'] = array(
+ 'type' => 'radio',
+ 'label-message' => 'bs-contextmenu-pref-modus',
+ 'section' => 'bluespice/contextmenu',
+ 'options' => array(
+ wfMessage(
'bs-contextmenu-pref-modus-ctrl-and-right-mouse' )->text() => 'ctrl',
+ wfMessage(
'bs-contextmenu-pref-modus-just-right-mouse' )->text() => 'no-ctrl'
+ ),
+ 'default' => 'ctrl',
+ );
+ return true;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/393778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iedb4ed355b37fd4961abc24e3bb4df3daf058711
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceContextMenu
Gerrit-Branch: master
Gerrit-Owner: Pmiguelpirzer <schmir...@gmail.com>
Gerrit-Reviewer: Ljonka <l.verhovs...@gmail.com>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
