diff --git a/.gitignore b/.gitignore index e8e7d81..52d874f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,16 @@ +igp_* +attic *.gz *.swp +pub/System/InfiniteScrollContrib/git/ pub/System/InfiniteScrollContrib/jquery.infinitescroll.init.js pub/System/InfiniteScrollContrib/jquery.infinitescroll.js pub/System/InfiniteScrollContrib/jquery.infinitescroll.init.js pub/System/InfiniteScrollContrib/jquery.infinitescroll.js -InfiniteScrollContrib.md5 -InfiniteScrollContrib.sha1 -InfiniteScrollContrib.tgz -InfiniteScrollContrib.txt -InfiniteScrollContrib.zip -InfiniteScrollContrib_installer -InfiniteScrollContrib_installer.pl +/InfiniteScrollContrib.md5 +/InfiniteScrollContrib.sha1 +/InfiniteScrollContrib.tgz +/InfiniteScrollContrib.txt +/InfiniteScrollContrib.zip +/InfiniteScrollContrib_installer +/InfiniteScrollContrib_installer.pl diff --git a/data/System/InfiniteScrollContrib.txt b/data/System/InfiniteScrollContrib.txt index 6923244..9422214 100644 --- a/data/System/InfiniteScrollContrib.txt +++ b/data/System/InfiniteScrollContrib.txt @@ -1,6 +1,6 @@ -%META:TOPICINFO{author="micha" comment="reprev" date="1364485421" format="1.1" reprev="10" version="10"}% +%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1364485421" format="1.1" reprev="10" version="1"}% ---+!! %TOPIC% -%SHORTDESCRIPTION% +%FORMFIELD{"Description"}% Based on http://www.infinite-scroll.com/ by Paul Irish & Luke Shumard (with some modifications available at https://github.com/MichaelDaum/infinite-scroll as well). @@ -214,21 +214,27 @@ Example: ---++ Installation Instructions - %$INSTALL_INSTRUCTIONS% - -| Author(s): | Michael Daum| -| Copyright: | © Paul Irish & Luke Shumard http://www.infinite-scroll.com, Michael Daum http://michaeldaumconsulting.com | -| License: | licensed GPL & MIT | -| Release: | %$RELEASE% | -| Version: | %$VERSION% | -| Change History: |   | + +---++ Dependencies +%$DEPENDENCIES% + +---++ Change History + +%TABLE{columnwidths="7em" tablewidth="100%"}% +| 16 Aug 2018 | maintenance and docu | | 28 Mar 2013 | fixed demo | | 01 Oct 2012 | fix for newer jqueries | | 24 Feb 2012 | fixed syntax error breaking dependency check of configure and pseudo-install | | 06 Jun 2011 | initial release | -| Dependencies: | %$DEPENDENCIES% | -| Home page: | Foswiki:Extensions/%TOPIC% | -| Support: | Foswiki:Support/%TOPIC% | + +%META:FORM{name="PackageForm"}% +%META:FIELD{name="Author" title="Author" value="Michael Daum"}% +%META:FIELD{name="Copyright" title="Copyright" value="© Paul Irish & Luke Shumard http://www.infinite-scroll.com, Michael Daum http://michaeldaumconsulting.com"}% +%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}% +%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions/%TOPIC%"}% +%META:FIELD{name="License" title="License" value="licensed GPL & MIT"}% +%META:FIELD{name="Release" title="Release" value="%$RELEASE%"}% +%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/%TOPIC%"}% +%META:FIELD{name="Support" title="Support" value="Foswiki:Support/%TOPIC%"}% +%META:FIELD{name="Version" title="Version" value="%$VERSION%"}% diff --git a/lib/Foswiki/Contrib/InfiniteScrollContrib.pm b/lib/Foswiki/Contrib/InfiniteScrollContrib.pm index 35b340f..b6887d5 100644 --- a/lib/Foswiki/Contrib/InfiniteScrollContrib.pm +++ b/lib/Foswiki/Contrib/InfiniteScrollContrib.pm @@ -1,16 +1,27 @@ +# Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/ +# +# Copyright (C) 2011-2018 Foswiki Contributors +# +# For licensing info read LICENSE file in the Foswiki root. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details, published at +# http://www.gnu.org/copyleft/gpl.html + package Foswiki::Contrib::InfiniteScrollContrib; use strict; use warnings; -our $VERSION = '1.13'; -our $RELEASE = '1.13'; +our $VERSION = '1.14'; +our $RELEASE = '16 Aug 2018'; our $SHORTDESCRIPTION = 'Infinite scrolling layouts'; our $NO_PREFS_IN_TOPIC = 1; -sub init { - require Foswiki::Plugins::JQueryPlugin; - Foswiki::Plugins::JQueryPlugin::registerPlugin("InfiniteScroll", "Foswiki::Contrib::InfiniteScrollContrib::Core"); -} - 1; diff --git a/lib/Foswiki/Contrib/InfiniteScrollContrib/MANIFEST b/lib/Foswiki/Contrib/InfiniteScrollContrib/MANIFEST index 236f89f..3865736 100644 --- a/lib/Foswiki/Contrib/InfiniteScrollContrib/MANIFEST +++ b/lib/Foswiki/Contrib/InfiniteScrollContrib/MANIFEST @@ -1,3 +1,4 @@ +!noci data/System/InfiniteScrollContrib.txt 0644 lib/Foswiki/Contrib/InfiniteScrollContrib/Config.spec 0644 lib/Foswiki/Contrib/InfiniteScrollContrib/Core.pm 0644 diff --git a/lib/Foswiki/Contrib/InfiniteScrollContrib/build.pl b/lib/Foswiki/Contrib/InfiniteScrollContrib/build.pl index c41f3da..9b30aae 100755 --- a/lib/Foswiki/Contrib/InfiniteScrollContrib/build.pl +++ b/lib/Foswiki/Contrib/InfiniteScrollContrib/build.pl @@ -1,24 +1,10 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl BEGIN { unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} ); } use Foswiki::Contrib::Build; # Create the build object $build = new Foswiki::Contrib::Build('InfiniteScrollContrib'); -# (Optional) Set the details of the repository for uploads. -# This can be any web on any accessible Foswiki installation. -# These defaults will be used when expanding tokens in .txt -# files, but be warned, they can be overridden at upload time! - -# name of web to upload to -$build->{UPLOADTARGETWEB} = 'Extensions'; -# Full URL of pub directory -$build->{UPLOADTARGETPUB} = 'http://foswiki.org/pub'; -# Full URL of bin directory -$build->{UPLOADTARGETSCRIPT} = 'http://foswiki.org/bin'; -# Script extension -$build->{UPLOADTARGETSUFFIX} = ''; - # Build the target on the command line, or the default target $build->build($build->{target}); diff --git a/pub/System/InfiniteScrollContrib/Makefile b/pub/System/InfiniteScrollContrib/Makefile index fda38e6..37b69fe 100644 --- a/pub/System/InfiniteScrollContrib/Makefile +++ b/pub/System/InfiniteScrollContrib/Makefile @@ -1,6 +1,16 @@ -FOSWIKI_ROOT?=~/foswiki/trunk/core +FOSWIKI_ROOT?=~/foswiki/core TARGET=\ jquery.infinitescroll.js \ jquery.infinitescroll.init.js -include $(FOSWIKI_ROOT)/pub/System/JQueryPlugin/Makefile.include + +.PHONY: git + +git: + git clone git@github.com:MichaelDaum/infinite-scroll.git git + +ifneq (,$(wildcard git)) +#jquery.infinitescroll.uncompressed.js: git/jquery.infinitescroll.js +# cp $^ $@ +endif