From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 4 May 2015 12:00:33 +0000 (+0200)
Subject: Merge branch 'next' of github.com:WoltLab/WCF into next
X-Git-Tag: 3.0.0_Beta_1~2416
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4efd3bd530f8f77635c5094f6fbb5afc4ddbdb8b;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'next' of github.com:WoltLab/WCF into next

Conflicts:
	com.woltlab.wcf/templates/headIncludeJavaScript.tpl
	wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
---

4efd3bd530f8f77635c5094f6fbb5afc4ddbdb8b
diff --cc com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index e63e9235db,814f75286f..c310324ff9
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@@ -138,7 -145,13 +138,7 @@@
  		baseUrl: '{@$__wcf->getPath()}js'
  	});
  	
- 	define('jQuery', [], function() { return window.jQuery; });
 -	/*require(function(require) {
 -		var ui = require('WCF/UI');
 -		
 -		console.debug(ui);
 -	});*/
 -	
+ 	define('jquery', [], function() { return window.jQuery; });
  	
  	$.holdReady(true);
  	require(['WoltLab/WCF/Bootstrap'], function(bootstrap) {
diff --cc wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
index 9ceafe0b33,d7cd4cee9e..01f91db5dc
--- a/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js
@@@ -9,11 -9,9 +9,11 @@@
   * @module	WoltLab/WCF/Bootstrap
   */
  define(
- 	[       'favico', 'enquire', 'WoltLab/WCF/Date/Time/Relative', 'UI/SimpleDropdown', 'WoltLab/WCF/UI/Mobile', 'WoltLab/WCF/UI/TabMenu', 'WoltLab/WCF/UI/FlexibleMenu'], 
- 	function(favico,   enquire,   relativeTime,                     simpleDropdown,      uiMobile,                TabMenu,                  FlexibleMenu)
 -	[       'jquery', 'favico', 'enquire', 'WoltLab/WCF/Date/Time/Relative', 'UI/SimpleDropdown', 'WoltLab/WCF/UI/Mobile', 'WoltLab/WCF/UI/TabMenu'], 
 -	function($,        favico,   enquire,   relativeTime,                     simpleDropdown,      uiMobile,                TabMenu)
++	[       'jquery', 'favico', 'enquire', 'WoltLab/WCF/Date/Time/Relative', 'UI/SimpleDropdown', 'WoltLab/WCF/UI/Mobile', 'WoltLab/WCF/UI/TabMenu', 'WoltLab/WCF/UI/FlexibleMenu'], 
++	function($,        favico,   enquire,   relativeTime,                     simpleDropdown,      uiMobile,                TabMenu,                  UIFlexibleMenu)
  {
 +	"use strict";
 +	
  	window.Favico = favico;
  	window.enquire = enquire;