From 71eae2c531419274a1ec085f6a6485038e98c9f3 Mon Sep 17 00:00:00 2001 From: Max Tobias Weber Date: Wed, 9 May 2012 16:25:56 +0300 Subject: [PATCH 001/104] Update src/jquery.columnizer.js --- src/jquery.columnizer.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/jquery.columnizer.js b/src/jquery.columnizer.js index bb67d3d..0d7876d 100644 --- a/src/jquery.columnizer.js +++ b/src/jquery.columnizer.js @@ -251,6 +251,8 @@ } function columnizeIt() { + //reset adjustment var + adjustment = 0; if(lastWidth == $inBox.width()) return; lastWidth = $inBox.width(); From bb80c7a3c5fa1d242ddb9c51ade92bd305378172 Mon Sep 17 00:00:00 2001 From: Adam Wulf Date: Thu, 26 Jul 2012 16:57:48 -0500 Subject: [PATCH 002/104] organized the files better and described the samples properly --- compress.sh | 13 ++++ samples/index.html | 21 ++++++ {src => samples}/painting1.jpg | Bin {src => samples}/painting2.jpg | Bin {src => samples}/painting3.jpg | Bin {src => samples}/painting4.jpg | Bin {src => samples}/reset.css | 0 {src => samples}/sample1.html | 2 +- src/sample12.html => samples/sample10.html | 2 +- src/sample13.html => samples/sample11.html | 2 +- {src => samples}/sample2.html | 2 +- src/sample.html => samples/sample3.html | 2 +- {src => samples}/sample4.html | 2 +- {src => samples}/sample5.html | 2 +- {src => samples}/sample6.html | 2 +- src/sample8.html => samples/sample7.html | 2 +- src/sample9.html => samples/sample8.html | 2 +- src/sample10.html => samples/sample9.html | 2 +- src/bug7.html | 40 ----------- src/bug8.css | 65 ------------------ src/bug8.html | 49 -------------- src/compress.php | 6 -- src/compress.sh | 12 ---- src/index.html | 22 ------ src/jquery.columnizer.min.js | 38 ----------- src/sample11.html | 72 -------------------- src/sample3.html | 75 --------------------- src/sample7.html | 71 ------------------- tools/compress.php | 6 ++ {src => tools}/jsmin-1.1.1.php | 0 30 files changed, 51 insertions(+), 461 deletions(-) create mode 100755 compress.sh create mode 100644 samples/index.html rename {src => samples}/painting1.jpg (100%) rename {src => samples}/painting2.jpg (100%) rename {src => samples}/painting3.jpg (100%) rename {src => samples}/painting4.jpg (100%) rename {src => samples}/reset.css (100%) rename {src => samples}/sample1.html (98%) rename src/sample12.html => samples/sample10.html (98%) rename src/sample13.html => samples/sample11.html (98%) rename {src => samples}/sample2.html (99%) rename src/sample.html => samples/sample3.html (98%) rename {src => samples}/sample4.html (99%) rename {src => samples}/sample5.html (98%) rename {src => samples}/sample6.html (97%) rename src/sample8.html => samples/sample7.html (98%) rename src/sample9.html => samples/sample8.html (99%) rename src/sample10.html => samples/sample9.html (99%) delete mode 100644 src/bug7.html delete mode 100644 src/bug8.css delete mode 100644 src/bug8.html delete mode 100644 src/compress.php delete mode 100755 src/compress.sh delete mode 100644 src/index.html delete mode 100644 src/jquery.columnizer.min.js delete mode 100644 src/sample11.html delete mode 100644 src/sample3.html delete mode 100644 src/sample7.html create mode 100644 tools/compress.php rename {src => tools}/jsmin-1.1.1.php (100%) diff --git a/compress.sh b/compress.sh new file mode 100755 index 0000000..558ba79 --- /dev/null +++ b/compress.sh @@ -0,0 +1,13 @@ +php tools/compress.php + +rm -rf columnizer +rm columnizer.zip + +mkdir columnizer +cp -r src/ columnizer/src +cp -r samples/ columnizer/samples + +zip -r columnizer columnizer/* + +rm -rf columnizer +rm src/jquery.columnizer.min.js diff --git a/samples/index.html b/samples/index.html new file mode 100644 index 0000000..63c4c30 --- /dev/null +++ b/samples/index.html @@ -0,0 +1,21 @@ +

Columnizer JQuery Plugin

+

About

+

Columnizer will automatically split your 1 div of content into as many columns as will fit the user's browser! If +the browser is resized, columns will be automatically added or removed appropriately.

+

+

For documentation, samples, and latest news, visit the project homepage at http://welcome.totheinter.net/columnizer-jquery-plugin/

+

+

Columnizer is a jQuery plugin by Adam Wulf (http://welcome.totheinter.net/)

+

+

Samples

+

sample 1 - Shows two independent columnized sections of text, a top and bottom section.

+

sample 2 - Shows two independent columnized sections of content with both images and text.

+

sample 3 - This example shows text being columnized into a top fixed-height section, and then overflowing into a columnized bottom section.

+

sample 4 - Preserves JavaScript events on <a> tags of the columnized content.

+

sample 5 - Fixed height and horizontal scrolling columns.

+

sample 6 - Style the first column differently than the rest of the content.

+

sample 7 - Columns wrap around an image in the top right of the page.

+

sample 8 - Lays out and preserves entire blocks of content into columns.

+

sample 9 - Uses columnizer to paginate content into a multi-page newsletter layout.

+

sample 10 - Shows zero padding between columns.

+

sample 11 - Shows CSS specified padding between columns.

diff --git a/src/painting1.jpg b/samples/painting1.jpg similarity index 100% rename from src/painting1.jpg rename to samples/painting1.jpg diff --git a/src/painting2.jpg b/samples/painting2.jpg similarity index 100% rename from src/painting2.jpg rename to samples/painting2.jpg diff --git a/src/painting3.jpg b/samples/painting3.jpg similarity index 100% rename from src/painting3.jpg rename to samples/painting3.jpg diff --git a/src/painting4.jpg b/samples/painting4.jpg similarity index 100% rename from src/painting4.jpg rename to samples/painting4.jpg diff --git a/src/reset.css b/samples/reset.css similarity index 100% rename from src/reset.css rename to samples/reset.css diff --git a/src/sample1.html b/samples/sample1.html similarity index 98% rename from src/sample1.html rename to samples/sample1.html index c41b4f3..1a319d4 100644 --- a/src/sample1.html +++ b/samples/sample1.html @@ -14,7 +14,7 @@ .wide, .thin { clear:both; } - + - + - + - + - + - + - + - + - + - + - + - - - - -
- -Para1: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec luctus varius lorem non pellentesque. Donec velit sapien, mollis sit amet auctor ac, pellentesque eu elit. Fusce posuere pretium sapien, a lacinia diam sagittis eget. Aliquam interdum auctor augue nec sodales. Fusce nec ligula nibh. Curabitur at velit a risus tristique porta in sit amet tortor. Nulla convallis dapibus enim, eget posuere sapien vulputate et. Nullam ac massa elit. Integer porta adipiscing orci, eu fringilla lorem egestas eget. Duis sagittis tristique ante ac varius. Ut fringilla fermentum facilisis. Aenean at pretium arcu. Etiam eu nibh eros, id pellentesque orci. Pellentesque congue mattis auctor. Maecenas fringilla aliquam libero. Etiam at augue velit. - -Para2: Proin ac risus pellentesque orci tristique blandit id at orci. Nunc lacinia nisi vitae orci consequat quis commodo lacus euismod. Cras hendrerit pretium aliquam. Praesent tincidunt eros sed turpis tempor vitae facilisis lectus iaculis. Cras pulvinar ipsum elit. Fusce et quam a tellus vestibulum elementum vitae nec sapien. Etiam iaculis tellus interdum urna vestibulum ut facilisis dolor hendrerit. Phasellus et mauris at sapien adipiscing suscipit id a nulla. Sed at elit ante. - -Para3: Aliquam mattis, est in commodo interdum, dolor dui volutpat lectus, sit amet hendrerit ante odio eu nulla. Maecenas sed pretium leo. Sed id velit vitae magna facilisis elementum. Mauris a quam nibh. Nunc commodo, felis vitae volutpat dictum, libero nulla condimentum urna, eget volutpat ligula risus quis orci. Phasellus in leo quam. Donec suscipit nisi vitae nulla interdum nec tristique velit feugiat. Curabitur rutrum, sapien ac congue iaculis, nisl ligula fringilla leo, a laoreet lacus leo eu elit. Proin elementum tortor nec nisi tincidunt ac aliquam velit rutrum. In ut gravida sapien. Cras eget sollicitudin erat. Nullam nec metus at nisi lacinia porta. Aenean et risus nunc. - -Para4: Ut tincidunt lacus id ligula sollicitudin non pulvinar risus pharetra. Ut velit est, gravida eget condimentum sed, viverra a nulla. Etiam auctor purus euismod erat pellentesque euismod viverra lorem accumsan. Maecenas gravida, eros in semper bibendum, nulla risus faucibus lectus, a laoreet lectus ligula porta mi. Curabitur odio ligula, pretium non sodales quis, lobortis laoreet neque. Lorem ipsum dolor sit amet, consectetur adipiscing elit. In non mi et elit accumsan euismod at eget erat. Pellentesque et elit velit, quis aliquet libero. Aenean lacus leo, fringilla et vestibulum non, ullamcorper sit amet nisl. In at fringilla magna. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis arcu ligula, scelerisque non sodales id, egestas et magna. In hac habitasse platea dictumst. Sed blandit, nisl congue lacinia luctus, dui ante posuere neque, a vehicula lacus risus et velit. Nam non ante sit amet purus auctor bibendum quis eu elit. Vivamus sed enim nec lorem semper placerat. - -Para5: Fusce vitae ante cursus tellus faucibus rutrum ut a felis. Donec in ligula purus. Nulla et metus dapibus dolor bibendum dapibus quis lacinia orci. Sed vel elementum sapien. Sed pharetra ipsum vitae augue volutpat vitae imperdiet nunc venenatis. Aliquam lobortis sagittis odio, in luctus enim commodo vel. In dapibus sagittis placerat. Aliquam laoreet gravida turpis, a tempus felis accumsan nec. Donec tempus scelerisque risus, ac tincidunt ipsum fringilla nec. Pellentesque pulvinar ornare arcu ac dictum. Proin facilisis magna a sem tempus gravida. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nunc eleifend suscipit risus, vitae porta sem interdum nec. In semper arcu sed erat pulvinar consectetur. Aenean lobortis massa sit amet quam pretium non tempus sem pellentesque. - -
- - diff --git a/src/bug8.css b/src/bug8.css deleted file mode 100644 index 885643c..0000000 --- a/src/bug8.css +++ /dev/null @@ -1,65 +0,0 @@ -.tabpanel -{ - position: relative; - border: 1px solid silver; - box-shadow: 3px 3px 3px silver; - background-color: rgba(255,255,255,0.5); - margin: 10px; - - position: absolute; - left: 230px; - top: 10px; - right: 20px; -} - -.tabpanel li, -.tabpanel h2 -{ - font-family: sans-serif; - line-height: 12px; - font-size: 11px; - margin: 0; - padding: 0; -} - -.tabpanel ul -{ - margin: 0; - padding: 0; - - list-style-type: none; - list-style-position: outside; - border-bottom: 1px solid #C2D9E7; - margin-bottom: 10px; - margin-right: 14px; - padding-top: 5px; -} - -.tabpanel div:last-child ul -{ - border-bottom: 1px solid transparent; -} - -.tabpanel li -{ - cursor: pointer; - position: relative; - margin: 10px; - padding-left: 22px; -} - -.tabpanel h2 -{ - font-weight: bold; - - font-weight: normal; - padding-left: 10px; - text-transform: none; - color: #F7941F; - display: inline; -} - -.tabpanel div div -{ - padding: 10px 0 0 10px; -} \ No newline at end of file diff --git a/src/bug8.html b/src/bug8.html deleted file mode 100644 index 59579d4..0000000 --- a/src/bug8.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - Columnize Hang Example - - - - - - -
- - \ No newline at end of file diff --git a/src/compress.php b/src/compress.php deleted file mode 100644 index c4b4b4e..0000000 --- a/src/compress.php +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/src/compress.sh b/src/compress.sh deleted file mode 100755 index 31e6491..0000000 --- a/src/compress.sh +++ /dev/null @@ -1,12 +0,0 @@ -php compress.php - -rm -rf columnizer -rm columnizer.zip - -mkdir columnizer -cp jquery*.js columnizer/ -cp *.jpg columnizer/ -cp *.html columnizer/ - -zip columnizer columnizer/* - diff --git a/src/index.html b/src/index.html deleted file mode 100644 index 0ee7e7d..0000000 --- a/src/index.html +++ /dev/null @@ -1,22 +0,0 @@ -

Columnizer JQuery Plugin

-

About

-

Columnizer will automatically split your 1 div of content into as many columns as will fit the user's browser! If -the browser is resized, columns will be automatically added or removed appropriately.

-

-

For documentation, samples, and latest news, visit the project homepage at http://welcome.totheinter.net/columnizer-jquery-plugin/

-

-

Columnizer is a jQuery plugin by Adam Wulf (http://welcome.totheinter.net/)

-

-

Samples

-

sample

-

sample 1

-

sample 2

-

sample 3

-

sample 4

-

sample 5

-

sample 6

-

sample 7

-

sample 8

-

sample 9

-

sample 10

-

sample 11

diff --git a/src/jquery.columnizer.min.js b/src/jquery.columnizer.min.js deleted file mode 100644 index 0fc925b..0000000 --- a/src/jquery.columnizer.min.js +++ /dev/null @@ -1,38 +0,0 @@ - -(function($){$.fn.columnize=function(options){var defaults={width:400,columns:false,buildOnce:false,overflow:false,doneFunc:function(){},target:false,ignoreImageLoading:true,columnFloat:"left",lastNeverTallest:false,accuracy:false};var options=$.extend(defaults,options);if(typeof(options.width)=="string"){options.width=parseInt(options.width);if(isNaN(options.width)){options.width=defaults.width;}} -return this.each(function(){var $inBox=options.target?$(options.target):$(this);var maxHeight=$(this).height();var $cache=$('
');var lastWidth=0;var columnizing=false;var adjustment=0;$cache.append($(this).contents().clone(true));if(!options.ignoreImageLoading&&!options.target){if(!$inBox.data("imageLoaded")){$inBox.data("imageLoaded",true);if($(this).find("img").length>0){var func=function($inBox,$cache){return function(){if(!$inBox.data("firstImageLoaded")){$inBox.data("firstImageLoaded","true");$inBox.empty().append($cache.children().clone(true));$inBox.columnize(options);}}}($(this),$cache);$(this).find("img").one("load",func);$(this).find("img").one("abort",func);return;}}} -$inBox.empty();columnizeIt();if(!options.buildOnce){$(window).resize(function(){if(!options.buildOnce&&$.browser.msie){if($inBox.data("timeout")){clearTimeout($inBox.data("timeout"));} -$inBox.data("timeout",setTimeout(columnizeIt,200));}else if(!options.buildOnce){columnizeIt();}else{}});} -function columnize($putInHere,$pullOutHere,$parentColumn,height){while($parentColumn.height()counter2){oText=oText.substring(oText.indexOf(' ',counter2));}else{oText="";}} -if($parentColumn.height()>=height&&latestTextNode!=null){$putInHere[0].removeChild(latestTextNode);oText=latestTextNode.nodeValue+oText;} -if(oText.length){$item[0].nodeValue=oText;}else{return false;}} -if($pullOutHere.children().length){$pullOutHere.prepend($item);}else{$pullOutHere.append($item);} -return $item[0].nodeType==3;} -function split($putInHere,$pullOutHere,$parentColumn,height){if($pullOutHere.children().length){$cloneMe=$pullOutHere.children(":first");$clone=$cloneMe.clone(true);if($clone.prop("nodeType")==1&&!$clone.hasClass("dontend")){$putInHere.append($clone);if($clone.is("img")&&$parentColumn.height()
"));$col=$inBox.children().eq($inBox.children().length-1);$destroyable=$cache.clone(true);if(options.overflow){targetHeight=options.overflow.height;columnize($col,$destroyable,$col,targetHeight);if(!$destroyable.contents().find(":first-child").hasClass("dontend")){split($col,$destroyable,$col,targetHeight);} -while(checkDontEndColumn($col.children(":last").length&&$col.children(":last").get(0))){var $lastKid=$col.children(":last");$lastKid.remove();$destroyable.prepend($lastKid);} -var html="";var div=document.createElement('DIV');while($destroyable[0].childNodes.length>0){var kid=$destroyable[0].childNodes[0];for(var i=0;i
"));$col=$inBox.children(":last");$col.append($cache.clone());maxHeight=$col.height();$inBox.empty();var targetHeight=maxHeight/numCols;var firstTime=true;var maxLoops=3;var scrollHorizontally=false;if(options.overflow){maxLoops=1;targetHeight=options.overflow.height;}else if(options.height&&options.width){maxLoops=1;targetHeight=options.height;scrollHorizontally=true;} -for(var loopCount=0;loopCount