diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index 6e8e79e0..fc6392fc 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -86,7 +86,7 @@ class AssetAdmin extends LeftAndMain { Requirements::javascript(CMS_DIR . "/javascript/CMSMain_upload.js"); Requirements::javascript(CMS_DIR . "/javascript/Upload.js"); - Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/swfupload/swfupload.js"); + Requirements::javascript(CMS_DIR . "/thirdparty/swfupload/swfupload.js"); Requirements::javascript(THIRDPARTY_DIR . "/greybox/AmiJS.js"); Requirements::javascript(THIRDPARTY_DIR . "/greybox/greybox.js"); diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 7a0a840a..da89b5d8 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -186,8 +186,8 @@ class LeftAndMain extends Controller { Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/effects.slide.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/effects.drop.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/effects.scale.js'); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-layout/jquery.layout.js'); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-fitheighttoparent/jquery.fitheighttoparent.js'); + Requirements::javascript(CMS_DIR . '/thirdparty/jquery-layout/jquery.layout.js'); + Requirements::javascript(CMS_DIR . '/javascript/jquery-fitheighttoparent/jquery.fitheighttoparent.js'); Requirements::javascript(CMS_DIR . '/javascript/ssui.core.js'); // @todo Load separately so the CSS files can be inlined Requirements::css(SAPPHIRE_DIR . '/thirdparty/jquery-ui-themes/smoothness/ui.all.css'); @@ -276,7 +276,7 @@ class LeftAndMain extends Controller { 'cms/javascript/LeftAndMain_right.js', 'jsparty/tree/tree.js', 'cms/javascript/TinyMCEImageEnhancement.js', - 'sapphire/thirdparty/swfupload/swfupload.js', + 'cms/thirdparty/swfupload/swfupload.js', 'cms/javascript/Upload.js', 'cms/javascript/TinyMCEImageEnhancement.js', 'sapphire/javascript/TreeSelectorField.js', diff --git a/javascript/jquery-fitheighttoparent/jquery.fitheighttoparent.js b/javascript/jquery-fitheighttoparent/jquery.fitheighttoparent.js new file mode 100644 index 00000000..9c952d56 --- /dev/null +++ b/javascript/jquery-fitheighttoparent/jquery.fitheighttoparent.js @@ -0,0 +1,53 @@ +/** + * Fits an element's height to its parent by substracting + * all (visible) siblings heights from the element. + * Caution: This will set overflow: hidden on the parent + * + * Copyright 2009 Ingo Schommer, SilverStripe Ltd. + * Licensed under MIT License: http://www.opensource.org/licenses/mit-license.php + * + * @todo Implement selectors to ignore certain elements + * + * @author Ingo Schommer, SilverStripe Ltd. + * @version 0.1 + */ +jQuery.fn.extend({ + fitHeightToParent: function() { + return jQuery(this).each(function() { + var $this = jQuery(this); + + var boxmodel = ['marginTop','marginBottom','paddingTop','paddingBottom','borderBottomWidth','borderTopWidth']; + + // don't bother if element or parent arent visible, + // we won't get height readings + if($this.is(':visible') && $this.parent().is(':visible')) { + + // we set overflow = hidden so that large children don't muck things up in IE6 box model + $this.parent().css('overflow', 'hidden'); + + // get height from parent without any margins as a starting point, + // and reduce any top/bottom paddings + var height = $this.parent().innerHeight() + - parseFloat($this.parent().css('paddingTop')) + - parseFloat($this.parent().css('paddingBottom')); + + // substract height of any siblings of the current element + // including their margins/paddings/borders + $this.siblings(':visible').filter(function() { + // remove all absolutely positioned elements + return (jQuery(this).css('position') != 'absolute'); + }).each(function() { + height -= jQuery(this).outerHeight(true); + }); + + // remove margins/paddings/borders on inner element + jQuery.each(boxmodel, function(i, name) { + height -= parseFloat($this.css(name)) || 0; + }); + + // set new height + $this.height(height); + } + }); + } +}); \ No newline at end of file diff --git a/javascript/jquery-fitheighttoparent/test.html b/javascript/jquery-fitheighttoparent/test.html new file mode 100644 index 00000000..8963b9dc --- /dev/null +++ b/javascript/jquery-fitheighttoparent/test.html @@ -0,0 +1,11 @@ + + +
+ + + + + test + + \ No newline at end of file diff --git a/javascript/jquery-fitheighttoparent/tests/unit.html b/javascript/jquery-fitheighttoparent/tests/unit.html new file mode 100644 index 00000000..ace86ead --- /dev/null +++ b/javascript/jquery-fitheighttoparent/tests/unit.html @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + +test 1
+test 2
+test 3
+test 4
+test 6
+Suspendisse vestibulum dignissim quam. Integer vel augue. Phasellus nulla purus, interdum ac, venenatis non, varius rutrum, leo. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis a eros. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Fusce magna mi, porttitor quis, convallis eget, sodales ac, urna. Phasellus luctus venenatis magna. Vivamus eget lacus. Nunc tincidunt convallis tortor. Duis eros mi, dictum vel, fringilla sit amet, fermentum id, sem. Phasellus nunc enim, faucibus ut, laoreet in, consequat id, metus. Vivamus dignissim. Cras lobortis tempor velit. Phasellus nec diam ac nisl lacinia tristique. Nullam nec metus id mi dictum dignissim. Nullam quis wisi non sem lobortis condimentum. Phasellus pulvinar, nulla non aliquam eleifend, tortor wisi scelerisque felis, in sollicitudin arcu ante lacinia leo.
++Suspendisse vestibulum dignissim quam. Integer vel augue. Phasellus nulla purus, interdum ac, venenatis non, varius rutrum, leo. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis a eros. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Fusce magna mi, porttitor quis, convallis eget, sodales ac, urna. Phasellus luctus venenatis magna. Vivamus eget lacus. Nunc tincidunt convallis tortor. Duis eros mi, dictum vel, fringilla sit amet, fermentum id, sem. Phasellus nunc enim, faucibus ut, laoreet in, consequat id, metus. Vivamus dignissim. Cras lobortis tempor velit. Phasellus nec diam ac nisl lacinia tristique. Nullam nec metus id mi dictum dignissim. Nullam quis wisi non sem lobortis condimentum. Phasellus pulvinar, nulla non aliquam eleifend, tortor wisi scelerisque felis, in sollicitudin arcu ante lacinia leo.
++Suspendisse vestibulum dignissim quam. Integer vel augue. Phasellus nulla purus, interdum ac, venenatis non, varius rutrum, leo. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis a eros. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Fusce magna mi, porttitor quis, convallis eget, sodales ac, urna. Phasellus luctus venenatis magna. Vivamus eget lacus. Nunc tincidunt convallis tortor. Duis eros mi, dictum vel, fringilla sit amet, fermentum id, sem. Phasellus nunc enim, faucibus ut, laoreet in, consequat id, metus. Vivamus dignissim. Cras lobortis tempor velit. Phasellus nec diam ac nisl lacinia tristique. Nullam nec metus id mi dictum dignissim. Nullam quis wisi non sem lobortis condimentum. Phasellus pulvinar, nulla non aliquam eleifend, tortor wisi scelerisque felis, in sollicitudin arcu ante lacinia leo.
+* Pane-resizing is disabled because ui.draggable.js is not linked
+* Pane-animation is disabled because ui.effects.js is not linked
+