Merge branch 'hotfix/3.2.4'

contao · Jan 20, 2014 · 75c8edb · 75c8edb
2 parents 05924e6 + ea34833
commit 75c8edb
Show file tree

Hide file tree

Showing 628 changed files with 18,377 additions and 1,576 deletions.
diff --git a/.htaccess.default b/.htaccess.default
@@ -1,7 +1,7 @@
 ##
 # Contao Open Source CMS
 #
-# Copyright (c) 2005-2013 Leo Feyer
+# Copyright (c) 2005-2014 Leo Feyer
 #
 # @package Core
 # @link    https://contao.org

diff --git a/.tx/purge b/.tx/purge
@@ -4,7 +4,7 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2013 Leo Feyer
+ * Copyright (c) 2005-2014 Leo Feyer
  *
  * @package Core
  * @link    https://contao.org

diff --git a/assets/contao/css/debug-uncompressed.css b/assets/contao/css/debug-uncompressed.css
@@ -1,7 +1,7 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2013 Leo Feyer
+ * Copyright (c) 2005-2014 Leo Feyer
  *
  * @package Core
  * @link    https://contao.org

diff --git a/assets/contao/css/debug.css b/assets/contao/css/debug.css
diff --git a/assets/contao/css/form-uncompressed.css b/assets/contao/css/form-uncompressed.css
@@ -1,7 +1,7 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2013 Leo Feyer
+ * Copyright (c) 2005-2014 Leo Feyer
  *
  * @package Core
  * @link    https://contao.org

diff --git a/assets/contao/css/form.css b/assets/contao/css/form.css
diff --git a/assets/contao/css/grid-uncompressed.css b/assets/contao/css/grid-uncompressed.css
@@ -1,7 +1,7 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2013 Leo Feyer
+ * Copyright (c) 2005-2014 Leo Feyer
  *
  * @package Core
  * @link    https://contao.org

diff --git a/assets/contao/css/grid.css b/assets/contao/css/grid.css
diff --git a/assets/contao/css/layout-uncompressed.css b/assets/contao/css/layout-uncompressed.css
@@ -1,7 +1,7 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2013 Leo Feyer
+ * Copyright (c) 2005-2014 Leo Feyer
  *
  * @package Core
  * @link    https://contao.org

diff --git a/assets/contao/css/layout.css b/assets/contao/css/layout.css
diff --git a/assets/contao/css/reset-uncompressed.css b/assets/contao/css/reset-uncompressed.css
@@ -1,7 +1,7 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2013 Leo Feyer
+ * Copyright (c) 2005-2014 Leo Feyer
  *
  * @package Core
  * @link    https://contao.org

diff --git a/assets/contao/css/reset.css b/assets/contao/css/reset.css
diff --git a/assets/contao/js/core-uncompressed.js b/assets/contao/js/core-uncompressed.js
@@ -1,7 +1,7 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2013 Leo Feyer
+ * Copyright (c) 2005-2014 Leo Feyer
  *
  * @package Typolinks
  * @see     https://contao.org
@@ -13,7 +13,7 @@
  * Class AjaxRequest
  *
  * Provide methods to handle Ajax requests.
- * @copyright  Leo Feyer 2005-2013
+ * @copyright  Leo Feyer 2005-2014
  * @author     Leo Feyer <https://contao.org>
  */
 var AjaxRequest =
@@ -698,7 +698,7 @@ var AjaxRequest =
  * Class Backend
  *
  * Provide methods to handle back end tasks.
- * @copyright  Leo Feyer 2005-2013
+ * @copyright  Leo Feyer 2005-2014
  * @author     Leo Feyer <https://contao.org>
  */
 var Backend =
@@ -1998,7 +1998,7 @@ window.addEvent('ajax_change', function() {
  * Class TinyCallback
  *
  * Provide callback functions for TinyMCE.
- * @copyright  Leo Feyer 2005-2013
+ * @copyright  Leo Feyer 2005-2014
  * @author     Leo Feyer <https://contao.org>
  */
 var TinyCallback =

diff --git a/assets/contao/js/core.js b/assets/contao/js/core.js
diff --git a/assets/jquery/tablesorter/2.0.5/css/tablesorter.css b/assets/jquery/tablesorter/2.0.5/css/tablesorter.css
@@ -1,4 +1,4 @@
-/* Contao Open Source CMS, (c) 2005-2013 Leo Feyer, LGPL license */
+/* Contao Open Source CMS, (c) 2005-2014 Leo Feyer, LGPL license */
 table.sortable thead th { background-image:url("../images/default.gif"); background-repeat:no-repeat; background-position:center right; }
 table.sortable thead th.headerSortDown { background-image:url("../images/asc.gif"); }
 table.sortable thead th.headerSortUp { background-image:url("../images/desc.gif"); }
diff --git a/assets/jquery/tablesorter/2.0.5/css/tablesorter.min.css b/assets/jquery/tablesorter/2.0.5/css/tablesorter.min.css
diff --git a/assets/mootools/mootao/Mootao-uncompressed.js b/assets/mootools/mootao/Mootao-uncompressed.js
@@ -1,7 +1,7 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2013 Leo Feyer
+ * Copyright (c) 2005-2014 Leo Feyer
  *
  * @package Mootao
  * @see     https://contao.org
@@ -138,10 +138,10 @@ Tips.Contao = new Class(
 			bounds = {y: false, x2: false, y2: false, x: false},
 			obj = {};
 
-		for (var z in props){
+		for (var z in props) {
 			obj[props[z]] = event.page[z] + this.options.offset[z];
 			if (obj[props[z]] < 0) bounds[z] = true;
-			if ((obj[props[z]] + tip[z] - scroll[z]) > size[z] - this.options.windowPadding[z]){
+			if ((obj[props[z]] + tip[z] - scroll[z]) > size[z] - this.options.windowPadding[z]) {
 				if (z == 'x') // Ignore vertical boundaries
 					obj[props[z]] = event.page[z] - this.options.offset[z] - tip[z];
 				bounds[z+'2'] = true;
@@ -152,10 +152,10 @@ Tips.Contao = new Class(
 
 		// Adjust the arrow on left/right aligned tips
 		if (bounds.x2) {
-			obj['margin-left'] = '24px';
+			obj.left += 24;
 			top.setStyles({'left': 'auto', 'right': '9px'});
 		} else {
-			obj['margin-left'] = '-9px';
+			obj.left -= 9;
 			top.setStyles({'left': '9px', 'right': 'auto'});
 		}