From 0db980b2315b393a639a9af4eaada41c86338d99 Mon Sep 17 00:00:00 2001 From: Matt Edlefsen Date: Tue, 17 Jul 2012 11:20:40 -0400 Subject: [PATCH 1/6] Add support for pre-1.6 jquery Use attr instead of prop if jquery < 1.6 --- src/jquery.columnizer.js | 7 ++++++- src/jquery.columnizer.min.js | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/jquery.columnizer.js b/src/jquery.columnizer.js index bb67d3d..b2b4136 100644 --- a/src/jquery.columnizer.js +++ b/src/jquery.columnizer.js @@ -166,7 +166,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/src/jquery.columnizer.min.js index 0fc925b..43bebcf 100644 --- a/src/jquery.columnizer.min.js +++ b/src/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);} From 6874d4b196c7c229d4b4c9ea45a3d8af17a13d80 Mon Sep 17 00:00:00 2001 From: Matt Edlefsen Date: Tue, 17 Jul 2012 11:24:37 -0400 Subject: [PATCH 2/6] Fix compressor --- src/compress.php | 2 +- src/compress.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/compress.php b/src/compress.php index c4b4b4e..3f288af 100644 --- a/src/compress.php +++ b/src/compress.php @@ -1,4 +1,4 @@ - Date: Tue, 17 Jul 2012 11:26:23 -0400 Subject: [PATCH 3/6] Update version to 1.5.1 --- src/jquery.columnizer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/jquery.columnizer.js b/src/jquery.columnizer.js index b2b4136..743f9c3 100644 --- a/src/jquery.columnizer.js +++ b/src/jquery.columnizer.js @@ -1,6 +1,7 @@ -// version 1.5.0 +// version 1.5.1 // http://welcome.totheinter.net/columnizer-jquery-plugin/ // created by: Adam Wulf @adamwulf, adam.wulf@gmail.com +// edited by: Matt Edlefsen (function($){ From 26e9d6a79e24ebb96099b2230870f30ce9ba13fb Mon Sep 17 00:00:00 2001 From: Matt Edlefsen Date: Tue, 17 Jul 2012 11:29:09 -0400 Subject: [PATCH 4/6] Move files to repo root --- src/bug7.html => bug7.html | 0 src/bug8.css => bug8.css | 0 src/bug8.html => bug8.html | 0 src/compress.php => compress.php | 0 src/compress.sh => compress.sh | 0 src/index.html => index.html | 0 src/jquery.columnizer.js => jquery.columnizer.js | 0 ...ry.columnizer.min.js => jquery.columnizer.min.js | 0 src/jquery.js => jquery.js | 0 src/jsmin-1.1.1.php => jsmin-1.1.1.php | 0 src/painting1.jpg => painting1.jpg | Bin src/painting2.jpg => painting2.jpg | Bin src/painting3.jpg => painting3.jpg | Bin src/painting4.jpg => painting4.jpg | Bin src/reset.css => reset.css | 0 src/sample.html => sample.html | 0 src/sample1.html => sample1.html | 0 src/sample10.html => sample10.html | 0 src/sample11.html => sample11.html | 0 src/sample12.html => sample12.html | 0 src/sample13.html => sample13.html | 0 src/sample2.html => sample2.html | 0 src/sample3.html => sample3.html | 0 src/sample4.html => sample4.html | 0 src/sample5.html => sample5.html | 0 src/sample6.html => sample6.html | 0 src/sample7.html => sample7.html | 0 src/sample8.html => sample8.html | 0 src/sample9.html => sample9.html | 0 29 files changed, 0 insertions(+), 0 deletions(-) rename src/bug7.html => bug7.html (100%) rename src/bug8.css => bug8.css (100%) rename src/bug8.html => bug8.html (100%) rename src/compress.php => compress.php (100%) rename src/compress.sh => compress.sh (100%) rename src/index.html => index.html (100%) rename src/jquery.columnizer.js => jquery.columnizer.js (100%) rename src/jquery.columnizer.min.js => jquery.columnizer.min.js (100%) rename src/jquery.js => jquery.js (100%) rename src/jsmin-1.1.1.php => jsmin-1.1.1.php (100%) rename src/painting1.jpg => painting1.jpg (100%) rename src/painting2.jpg => painting2.jpg (100%) rename src/painting3.jpg => painting3.jpg (100%) rename src/painting4.jpg => painting4.jpg (100%) rename src/reset.css => reset.css (100%) rename src/sample.html => sample.html (100%) rename src/sample1.html => sample1.html (100%) rename src/sample10.html => sample10.html (100%) rename src/sample11.html => sample11.html (100%) rename src/sample12.html => sample12.html (100%) rename src/sample13.html => sample13.html (100%) rename src/sample2.html => sample2.html (100%) rename src/sample3.html => sample3.html (100%) rename src/sample4.html => sample4.html (100%) rename src/sample5.html => sample5.html (100%) rename src/sample6.html => sample6.html (100%) rename src/sample7.html => sample7.html (100%) rename src/sample8.html => sample8.html (100%) rename src/sample9.html => sample9.html (100%) 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 100% rename from src/compress.php rename to compress.php diff --git a/src/compress.sh b/compress.sh similarity index 100% rename from src/compress.sh rename to compress.sh diff --git a/src/index.html b/index.html similarity index 100% rename from src/index.html rename to index.html diff --git a/src/jquery.columnizer.js b/jquery.columnizer.js similarity index 100% rename from src/jquery.columnizer.js rename to jquery.columnizer.js diff --git a/src/jquery.columnizer.min.js b/jquery.columnizer.min.js similarity index 100% rename from src/jquery.columnizer.min.js rename to jquery.columnizer.min.js 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 From f3c7294be2c98d2dd8163e13d41529c9e681e18f Mon Sep 17 00:00:00 2001 From: Matt Edlefsen Date: Tue, 17 Jul 2012 11:32:25 -0400 Subject: [PATCH 5/6] Change compress.sh to use full projectname Now compresses to Columnizer-jQuery-Plugin instead of columnizer --- compress.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/compress.sh b/compress.sh index 4b0c71b..4542db9 100755 --- a/compress.sh +++ b/compress.sh @@ -1,10 +1,12 @@ php compress.php -rm -rf columnizer -rm columnizer.zip +PROJNAME=Columnizer-jQuery-Plugin -mkdir columnizer -cp jquery.columnizer*.js columnizer/ +rm -rf "$PROJNAME" +rm "$PROJNAME".zip -zip columnizer columnizer/* +mkdir "$PROJNAME" +cp jquery.columnizer*.js "$PROJNAME"/ + +zip "$PROJNAME" "$PROJNAME"/* From 23c01b09a97ad263b3bfe96153e9ee9277be5501 Mon Sep 17 00:00:00 2001 From: Matt Edlefsen Date: Tue, 17 Jul 2012 11:35:45 -0400 Subject: [PATCH 6/6] Improve README and include it in zip --- README | 13 ++++++++++++- compress.sh | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) 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/compress.sh b/compress.sh index 4542db9..c7f1c3c 100755 --- a/compress.sh +++ b/compress.sh @@ -6,7 +6,7 @@ rm -rf "$PROJNAME" rm "$PROJNAME".zip mkdir "$PROJNAME" -cp jquery.columnizer*.js "$PROJNAME"/ +cp README jquery.columnizer*.js "$PROJNAME"/ zip "$PROJNAME" "$PROJNAME"/*