diff --git a/README b/README index 5dfee55..0cbf502 100644 --- a/README +++ b/README @@ -1,3 +1,14 @@ -To compress into a zip file, run compress.sh +jquery columnizer plugin +======================== + +This is a fork of https://github.com/adamwulf/Columnizer-jQuery-Plugin + +https://github.com/xforty/Columnizer-jQuery-Plugin +Documentation +------------- + +http://welcome.totheinter.net/columnizer-jquery-plugin/ + +To compress into a zip file, run compress.sh diff --git a/src/bug7.html b/bug7.html similarity index 100% rename from src/bug7.html rename to bug7.html diff --git a/src/bug8.css b/bug8.css similarity index 100% rename from src/bug8.css rename to bug8.css diff --git a/src/bug8.html b/bug8.html similarity index 100% rename from src/bug8.html rename to bug8.html diff --git a/src/compress.php b/compress.php similarity index 96% rename from src/compress.php rename to compress.php index c4b4b4e..3f288af 100644 --- a/src/compress.php +++ b/compress.php @@ -1,4 +1,4 @@ - (function($){ @@ -166,7 +167,12 @@ if($pullOutHere.children().length){ $cloneMe = $pullOutHere.children(":first"); $clone = $cloneMe.clone(true); - if($clone.prop("nodeType") == 1 && !$clone.hasClass("dontend")){ + if ($().jquery.match(/1\.[1-5]\..+/)) { + var nodeType = $clone.attr("nodeType"); + } else { + var nodeType = $clone.prop("nodeType"); + } + if(nodeType == 1 && !$clone.hasClass("dontend")){ $putInHere.append($clone); if($clone.is("img") && $parentColumn.height() < height + 20){ $cloneMe.remove(); diff --git a/src/jquery.columnizer.min.js b/jquery.columnizer.min.js similarity index 93% rename from src/jquery.columnizer.min.js rename to jquery.columnizer.min.js index 0fc925b..43bebcf 100644 --- a/src/jquery.columnizer.min.js +++ b/jquery.columnizer.min.js @@ -11,7 +11,8 @@ if($parentColumn.height()>=height&&latestTextNode!=null){$putInHere[0].removeChi 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);} diff --git a/src/jquery.js b/jquery.js similarity index 100% rename from src/jquery.js rename to jquery.js diff --git a/src/jsmin-1.1.1.php b/jsmin-1.1.1.php similarity index 100% rename from src/jsmin-1.1.1.php rename to jsmin-1.1.1.php diff --git a/src/painting1.jpg b/painting1.jpg similarity index 100% rename from src/painting1.jpg rename to painting1.jpg diff --git a/src/painting2.jpg b/painting2.jpg similarity index 100% rename from src/painting2.jpg rename to painting2.jpg diff --git a/src/painting3.jpg b/painting3.jpg similarity index 100% rename from src/painting3.jpg rename to painting3.jpg diff --git a/src/painting4.jpg b/painting4.jpg similarity index 100% rename from src/painting4.jpg rename to painting4.jpg diff --git a/src/reset.css b/reset.css similarity index 100% rename from src/reset.css rename to reset.css diff --git a/src/sample.html b/sample.html similarity index 100% rename from src/sample.html rename to sample.html diff --git a/src/sample1.html b/sample1.html similarity index 100% rename from src/sample1.html rename to sample1.html diff --git a/src/sample10.html b/sample10.html similarity index 100% rename from src/sample10.html rename to sample10.html diff --git a/src/sample11.html b/sample11.html similarity index 100% rename from src/sample11.html rename to sample11.html diff --git a/src/sample12.html b/sample12.html similarity index 100% rename from src/sample12.html rename to sample12.html diff --git a/src/sample13.html b/sample13.html similarity index 100% rename from src/sample13.html rename to sample13.html diff --git a/src/sample2.html b/sample2.html similarity index 100% rename from src/sample2.html rename to sample2.html diff --git a/src/sample3.html b/sample3.html similarity index 100% rename from src/sample3.html rename to sample3.html diff --git a/src/sample4.html b/sample4.html similarity index 100% rename from src/sample4.html rename to sample4.html diff --git a/src/sample5.html b/sample5.html similarity index 100% rename from src/sample5.html rename to sample5.html diff --git a/src/sample6.html b/sample6.html similarity index 100% rename from src/sample6.html rename to sample6.html diff --git a/src/sample7.html b/sample7.html similarity index 100% rename from src/sample7.html rename to sample7.html diff --git a/src/sample8.html b/sample8.html similarity index 100% rename from src/sample8.html rename to sample8.html diff --git a/src/sample9.html b/sample9.html similarity index 100% rename from src/sample9.html rename to sample9.html 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/* -