Refactor SimpleBatchUpload class

ProfessionalWiki · Jun 6, 2016 · 5ac601d · 5ac601d
1 parent 5078094
commit 5ac601d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
 	},
     "extra": {
         "branch-alias": {
-            "dev-master": "0.x-dev"
+            "dev-master": "1.x-dev"
 
         }
     }

diff --git a/res/ext.SimpleBatchUpload.js b/res/ext.SimpleBatchUpload.js
@@ -19,7 +19,8 @@
  * @ingroup SimpleBatchUpload
  */
 
-/** global: jQuery, mediaWiki */
+/** global: mediaWiki */
+/** global: jQuery */
 
 ;( function ( $, mw, undefined ) {
 

diff --git a/src/SimpleBatchUpload.php b/src/SimpleBatchUpload.php
@@ -42,56 +42,61 @@ public static function singleton() {
 		return self::$singleton;
 	}
 
-	/**
-	 *
-	 */
 	public static function initCallback() {
-		self::singleton()->init();
+		$GLOBALS[ 'wgHooks' ][ 'SetupAfterCache' ][ ] = function() {
+			self::singleton()->init();
+		};
 	}
 
-	/**
-	 *
-	 */
 	public function init() {
+
 		$GLOBALS[ 'wgExtensionMessagesFiles' ][ 'SimpleBatchUploadAlias' ] = __DIR__ . '/SimpleBatchUpload.alias.php';
 		$GLOBALS[ 'wgSpecialPages' ][ 'BatchUpload' ] = '\SimpleBatchUpload\SpecialBatchUpload';
 
-		$this->registerUploadModule();
+		$this->registerUploadProvidingModule();
+		$this->registerUploadUtilizingModule();
+	}
+
+	protected function registerUploadProvidingModule() {
+
+		$moduleDescription = [
+			'scripts' => [ '/vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js' ],
+			'styles'       => [	'/vendor/blueimp/jquery-file-upload/css/jquery.fileupload.css' ],
+			'position'     => 'top',
+			'dependencies' => [ 'jquery.ui.widget' ],
+		];
+
+		$this->registerResourceModule( 'ext.SimpleBatchUpload.jquery-file-upload', $moduleDescription, true );
 
-		$GLOBALS[ 'wgResourceModules' ][ 'ext.SimpleBatchUpload' ] = [
-			'localBasePath' => dirname( __DIR__ ),
-			'remoteExtPath' => $GLOBALS[ 'wgExtensionAssetsPath' ] . '/SimpleBatchUpload',
+	}
+
+	protected function registerUploadUtilizingModule() {
+
+		$moduleDescription = [
 			'scripts'       => [ 'res/ext.SimpleBatchUpload.js' ],
 			'styles'        => [ 'res/ext.SimpleBatchUpload.css' ],
 			'position'      => 'top',
 			'dependencies'  => [ 'ext.SimpleBatchUpload.jquery-file-upload', 'mediawiki.Title' ],
 		];
+
+		$this->registerResourceModule( 'ext.SimpleBatchUpload', $moduleDescription, false );
 	}
 
-	protected function registerUploadModule() {
-		if ( file_exists( '../vendor' ) ) {
+	/**
+	 * @return array
+	 */
+	protected function registerResourceModule( $moduleName, $moduleDefinition, $isDependency = false ) {
+
+		if ( file_exists( dirname( __DIR__ ) . '/vendor' ) || !$isDependency ) {
 			$localBasePath = dirname( __DIR__ );
 			$remoteBasePath = $GLOBALS[ 'wgExtensionAssetsPath' ] . '/SimpleBatchUpload';
 		} else {
 			$localBasePath = $GLOBALS[ 'IP' ];
 			$remoteBasePath = $GLOBALS[ 'wgScriptPath' ];
 		}
 
-		$GLOBALS[ 'wgResourceModules' ][ 'ext.SimpleBatchUpload.jquery-file-upload' ] = [
-			'localBasePath'  => $localBasePath . '/vendor/blueimp/jquery-file-upload/',
-			'remoteBasePath' => $remoteBasePath . '/vendor/blueimp/jquery-file-upload/',
+		$GLOBALS[ 'wgResourceModules' ][ $moduleName ] =
+			array_merge( [ 'localBasePath'  => $localBasePath, 'remoteBasePath' => $remoteBasePath ], $moduleDefinition );
 
-			'scripts' => [
-				'js/jquery.fileupload.js',
-			],
-
-			'styles'       => [
-				'css/jquery.fileupload.css',
-			],
-			'position'     => 'bottom',
-			'dependencies' => [ 'jquery.ui.widget' ],
-		];
 	}
-
-
 }
diff --git a/src/SpecialBatchUpload.php b/src/SpecialBatchUpload.php
@@ -55,11 +55,6 @@ protected function getGroupName() {
 	}
 
 	/**
-	 * Execute method
-	 * Checks user permissions
-	 *
-	 * This must be overridden by subclasses; it will be made abstract in a future version
-	 *
 	 * @param null|string $par
 	 * @throws \MWException
 	 */