Moved dataValues.util.inherit to util.inherit

.jshintrc

@@ -35,6 +35,7 @@
 		"QUnit",
 		"valueFormatters",
 		"valueParsers",
-		"time"
+		"time",
+		"util"
 	]
 }

DataValues.resources.php

@@ -38,7 +38,7 @@
 			),
 			'dependencies' => array(
 				'dataValues',
-				'dataValues.util',
+				'util.inherit',
 			),
 		),
 
@@ -60,20 +60,18 @@
 			),
 			'dependencies' => array(
 				'dataValues.DataValue',
+				'util.inherit',
 				'globeCoordinate.js', // required by GlobeCoordinateValue
 				'time.js' // required by TimeValue
 			),
 		),
 
-		'dataValues.util' => $moduleTemplate + array(
+		'util.inherit' => $moduleTemplate + array(
 			'scripts' => array(
-				'dataValues.util.js',
-				'dataValues.util.inherit.js',
-			),
-			'dependencies' => array(
-				'dataValues',
+				'../lib/util/util.inherit.js',
 			),
 		),
+
 	);
 
 } );

DataValues.tests.qunit.php

@@ -54,18 +54,18 @@
 			),
 			'dependencies' => array(
 				'dataValues.DataValue.tests',
-				'dataValues.values'
+				'dataValues.values',
+				'util.inherit',
 			),
 		),
 
-		'dataValues.util.tests' => array(
+		'util.inherit.tests' => array(
 			'scripts' => array(
-				"$bp/util.inherit/inherit.testWithDifferentArguments.js",
-				"$bp/util.inherit/inherit.testConstructorNames.js",
-				"$bp/util.inherit/inherit.testGeneratedConstructorNames.js",
+				"$bp/lib/util/util.inherit.tests.js",
 			),
 			'dependencies' => array(
-				'dataValues.util',
+				'jquery',
+				'util.inherit',
 			),
 		),
 

DataValuesJavascript.php

@@ -111,6 +111,7 @@
 			),
 			'dependencies' => array(
 				'ext.valueParsers.tests',
+				'util.inherit',
 			),
 		);
 
@@ -165,6 +166,7 @@
 			),
 			'dependencies' => array(
 				'ext.valueFormatters.tests',
+				'util.inherit',
 				'valueFormatters.formatters',
 			),
 		);

js/ValueFormatters.resources.php

@@ -31,7 +31,6 @@
 			),
 			'dependencies' => array(
 				'valueFormatters',
-				'valueFormatters.util',
 			),
 		),
 
@@ -51,20 +50,11 @@
 			),
 			'dependencies' => array(
 				'dataValues.values',
+				'util.inherit',
 				'valueFormatters.ValueFormatter',
 			),
 		),
 
-		'valueFormatters.util' => $moduleTemplate + array(
-				'scripts' => array(
-					'valueFormatters.util.js',
-				),
-				'dependencies' => array(
-					'dataValues.util',
-					'valueFormatters',
-				),
-			),
-
 	);
 
 } );

js/ValueParsers.resources.php

@@ -34,8 +34,8 @@
 				'parsers/ApiBasedValueParser.js',
 			),
 			'dependencies' => array(
+				'util.inherit',
 				'valueParsers',
-				'valueParsers.util',
 			),
 		),
 
@@ -60,23 +60,14 @@
 				'parsers/NullParser.js',
 			),
 			'dependencies' => array(
+				'util.inherit',
 				'valueParsers.ValueParser',
 				'valueParsers.api',
 				'globeCoordinate.js', // required by GlobeCoordinateParser
 				'time.js', // required by TimeParser
 			),
 		),
 
-		'valueParsers.util' => $moduleTemplate + array(
-			'scripts' => array(
-				'valueParsers.util.js',
-			),
-			'dependencies' => array(
-				'dataValues.util',
-				'valueParsers',
-			),
-		),
-
 		'valueParsers.api' => $moduleTemplate + array(
 			'scripts' => array(
 				'valueParsers.Api.js',

js/src/ValueFormatters/formatters/NullFormatter.js

@@ -2,7 +2,7 @@
  * @licence GNU GPL v2+
  * @author H. Snater < mediawiki@snater.com >
  */
-( function( $, vf, dv ) {
+( function( $, vf, dv, util ) {
 	'use strict';
 
 	var PARENT = vf.ValueFormatter;
@@ -19,7 +19,7 @@
 	 * @extends valueFormatters.ValueFormatter
 	 * @since 0.1
 	 */
-	vf.NullFormatter = vf.util.inherit( PARENT, function() {}, {
+	vf.NullFormatter = util.inherit( PARENT, function() {}, {
 		/**
 		 * @see valueFormatters.ValueFormatter.format
 		 */
@@ -45,4 +45,4 @@
 
 	} );
 
-}( jQuery, valueFormatters, dataValues ) );
+}( jQuery, valueFormatters, dataValues, util ) );

js/src/ValueFormatters/formatters/StringFormatter.js

@@ -2,7 +2,7 @@
  * @licence GNU GPL v2+
  * @author H. Snater < mediawiki@snater.com >
  */
-( function( $, vf ) {
+( function( $, vf, util ) {
 	'use strict';
 
 	var PARENT = vf.ValueFormatter;
@@ -13,7 +13,7 @@
 	 * @extends valueFormatters.ValueFormatter
 	 * @since 0.1
 	 */
-	vf.StringFormatter = vf.util.inherit( PARENT, {
+	vf.StringFormatter = util.inherit( PARENT, {
 		/**
 		 * @see valueFormatters.ValueFormatter.format
 		 * @since 0.1
@@ -30,4 +30,4 @@
 		}
 	} );
 
-}( jQuery, valueFormatters ) );
+}( jQuery, valueFormatters, util ) );

js/src/ValueFormatters/formatters/ValueFormatter.js

@@ -2,7 +2,7 @@
  * @licence GNU GPL v2+
  * @author H. Snater < mediawiki@snater.com >
  */
-( function( $, vf ) {
+( function( $, vf, util ) {
 	'use strict';
 
 	/**
@@ -54,8 +54,8 @@
 		 *         - {string|null} Formatted DataValue.
 		 *         - {dataValues.DataValue|null} DataValue object that has been formatted.
 		 */
-		format: vf.util.abstractMember
+		format: util.abstractMember
 
 	} );
 
-}( jQuery, valueFormatters ) );
+}( jQuery, valueFormatters, util ) );

js/src/ValueParsers/parsers/ApiBasedValueParser.js

@@ -1,12 +1,8 @@
 /**
- * @file
- * @ingroup ValueParsers
- *
  * @licence GNU GPL v2+
- *
  * @author Daniel Werner < danweetz@web.de >
  */
-( function( vp, dv, $ ) {
+( function( vp, dv, $, util ) {
 	'use strict';
 
 	var PARENT = vp.ValueParser;
@@ -20,7 +16,7 @@
 	 * @abstract
 	 * @since 0.1
 	 */
-	vp.ApiBasedValueParser = dv.util.inherit( 'VpApiBasedValueParser', PARENT, {
+	vp.ApiBasedValueParser = util.inherit( 'VpApiBasedValueParser', PARENT, {
 		/**
 		 * The key of the related API parser.
 		 * @type String
@@ -51,4 +47,4 @@
 
 	} );
 
-}( valueParsers, dataValues, jQuery ) );
+}( valueParsers, dataValues, jQuery, util ) );

js/src/ValueParsers/parsers/BoolParser.js

@@ -1,12 +1,8 @@
 /**
- * @file
- * @ingroup ValueParsers
- *
  * @licence GNU GPL v2+
- *
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-( function( vp, dv, $, undefined ) {
+( function( vp, dv, util ) {
 	'use strict';
 
 	var PARENT = vp.ApiBasedValueParser;
@@ -18,11 +14,11 @@
 	 * @extends vp.ApiBasedValueParser
 	 * @since 0.1
 	 */
-	vp.BoolParser = dv.util.inherit( PARENT, {
+	vp.BoolParser = util.inherit( PARENT, {
 		/**
 		 * @see ApiBasedValueParser.API_VALUE_PARSER_ID
 		 */
 		API_VALUE_PARSER_ID: 'bool'
 	} );
 
-}( valueParsers, dataValues, jQuery ) );
+}( valueParsers, dataValues, util ) );

js/src/ValueParsers/parsers/FloatParser.js

@@ -1,12 +1,8 @@
 /**
- * @file
- * @ingroup ValueParsers
- *
  * @licence GNU GPL v2+
- *
  * @author Daniel Werner < danweetz@web.de >
  */
-( function( vp, dv, $, undefined ) {
+( function( vp, dv, util ) {
 	'use strict';
 
 	var PARENT = vp.ApiBasedValueParser;
@@ -18,11 +14,11 @@
 	 * @extends vp.ApiBasedValueParser
 	 * @since 0.1
 	 */
-	vp.FloatParser = dv.util.inherit( PARENT, {
+	vp.FloatParser = util.inherit( PARENT, {
 		/**
 		 * @see ApiBasedValueParser.API_VALUE_PARSER_ID
 		 */
 		API_VALUE_PARSER_ID: 'float'
 	} );
 
-}( valueParsers, dataValues, jQuery ) );
+}( valueParsers, dataValues, util ) );

js/src/ValueParsers/parsers/GlobeCoordinateParser.js

@@ -1,12 +1,8 @@
 /**
- * @file
- * @ingroup ValueParsers
- *
  * @licence GNU GPL v2+
- *
  * @author H. Snater < mediawiki@snater.com >
  */
-( function( vp, dv ) {
+( function( vp, dv, util ) {
 	'use strict';
 
 	var PARENT = vp.ApiBasedValueParser;
@@ -18,11 +14,11 @@
 	 * @extends vp.ApiBasedValueParser
 	 * @since 0.1
 	 */
-	vp.GlobeCoordinateParser = dv.util.inherit( PARENT, {
+	vp.GlobeCoordinateParser = util.inherit( PARENT, {
 		/**
 		 * @see vp.ApiBasedValueParser.API_VALUE_PARSER_ID
 		 */
 		API_VALUE_PARSER_ID: 'globecoordinate'
 	} );
 
-}( valueParsers, dataValues ) );
+}( valueParsers, dataValues, util ) );

js/src/ValueParsers/parsers/IntParser.js

@@ -1,12 +1,8 @@
 /**
- * @file
- * @ingroup ValueParsers
- *
  * @licence GNU GPL v2+
- *
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-( function( vp, dv, $, undefined ) {
+( function( vp, dv, util ) {
 	'use strict';
 
 	var PARENT = vp.ApiBasedValueParser;
@@ -18,11 +14,11 @@
 	 * @extends vp.ApiBasedValueParser
 	 * @since 0.1
 	 */
-	vp.IntParser = dv.util.inherit( PARENT, {
+	vp.IntParser = util.inherit( PARENT, {
 		/**
 		 * @see ApiBasedValueParser.API_VALUE_PARSER_ID
 		 */
 		API_VALUE_PARSER_ID: 'int'
 	} );
 
-}( valueParsers, dataValues, jQuery ) );
+}( valueParsers, dataValues, util ) );