Merge branch 'master' into development

includes/Hooks.php

@@ -999,4 +999,12 @@ class TweekiHooks {
 		return true;
 	}
 	
+	public static function onOutputPageBodyAttributes( $out, $sk, &$bodyAttrs ) {
+		if ( isset( $bodyAttrs['class'] ) && strlen( $bodyAttrs['class'] ) > 0 ) {
+			$bodyAttrs['class'] .= ' ' . implode( ' ', SkinTweeki::$bodyClasses );
+		} else {
+			$bodyAttrs['class'] = implode( ' ', SkinTweeki::$bodyClasses );
+		}
+	}
+
 }

includes/SkinTweeki.php

@@ -42,7 +42,7 @@ class SkinTweeki extends SkinTemplate {
 			->makeConfig( 'tweeki' );
 	}
 
-	protected static $bodyClasses = array( 'tweeki-animateLayout' );
+	public static $bodyClasses = array( 'tweeki-animateLayout' );
 
 
 	/**
@@ -122,20 +122,6 @@ class SkinTweeki extends SkinTemplate {
 		$out->addModuleStyles( $styles );
 	}
 	
-	/**
-	 * Adds classes to the body element.
-	 *
-	 * @param $out OutputPage object
-	 * @param &$bodyAttrs Array of attributes that will be set on the body element
-	 */
-	function addToBodyAttributes( $out, &$bodyAttrs ) {
-		if ( isset( $bodyAttrs['class'] ) && strlen( $bodyAttrs['class'] ) > 0 ) {
-			$bodyAttrs['class'] .= ' ' . implode( ' ', static::$bodyClasses );
-		} else {
-			$bodyAttrs['class'] = implode( ' ', static::$bodyClasses );
-		}
-	}
-
 	/**
 	 * Override to pass our Config instance to it
 	 * @param string $classname

skin.json

@@ -38,7 +38,8 @@
 		"MagicWordMagicWords": "TweekiHooks::onMagicWordMagicWords",
 		"MagicWordwgVariableIDs": "TweekiHooks::onMagicWordwgVariableIDs",
 		"InternalParseBeforeLinks": "TweekiHooks::onInternalParseBeforeLinks",
-		"OutputPageBeforeHTML": "TweekiHooks::onOutputPageBeforeHTML"
+		"OutputPageBeforeHTML": "TweekiHooks::onOutputPageBeforeHTML",
+		"OutputPageBodyAttributes": "TweekiHooks::onOutputPageBodyAttributes"
 	},
 	"ResourceModules": {
 		"skins.tweeki.messages": {