diff --git a/cern-drupal-distribution-composer-project.md b/cern-drupal-distribution-composer-project.md index f8d2a70abf2f0acb6bfb6dbb279253b4afaf2108..c0187e34e6df8c0a6d34461344b9985f77907bc2 100644 --- a/cern-drupal-distribution-composer-project.md +++ b/cern-drupal-distribution-composer-project.md @@ -152,6 +152,6 @@ Note: find the latest versions for the libs with a `VERSION` variable. ( mkdir -p web/libraries/jquery.hoverIntent && cd $_ && wget https://raw.githubusercontent.com/briancherne/jquery-hoverIntent/master/jquery.hoverIntent.js; ) ( mkdir -p web/libraries/json2 && cd $_ && wget https://raw.githubusercontent.com/douglascrockford/JSON-js/master/json2.js; ) ( mkdir -p web/libraries/jquery.pause && cd $_ && wget https://raw.githubusercontent.com/tobia/Pause/master/jquery.pause.js; ) -( VERSION=4.16.0; cd web/libraries && wget https://download.ckeditor.com/colorbutton/releases/colorbutton_$VERSION.zip && unzip colorbutton_$VERSION.zip && rm colorbutton_$VERSION.zip; ) -( VERSION=4.16.0; cd web/libraries && wget https://download.ckeditor.com/panelbutton/releases/panelbutton_$VERSION.zip && unzip panelbutton_$VERSION.zip && rm panelbutton_$VERSION.zip; ) +( VERSION=4.16.2; cd web/libraries && wget https://download.ckeditor.com/colorbutton/releases/colorbutton_$VERSION.zip && unzip colorbutton_$VERSION.zip && rm colorbutton_$VERSION.zip; ) +( VERSION=4.16.2; cd web/libraries && wget https://download.ckeditor.com/panelbutton/releases/panelbutton_$VERSION.zip && unzip panelbutton_$VERSION.zip && rm panelbutton_$VERSION.zip; ) ``` diff --git a/composer.json b/composer.json index 8c20ed13e43e8ae2ceada3834ff37cd5e03d780e..8efa2499a0f262222d9082bf0223f6cc8f89046b 100644 --- a/composer.json +++ b/composer.json @@ -142,22 +142,22 @@ "drupal/bootstrap": "~3.23.0", "drupal/captcha": "~1.1.0", "drupal/cern-adminimal-subtheme": "~2.1.0", - "drupal/cern-base-theme": "~2.6.6", + "drupal/cern-base-theme": "~2.6.9", "drupal/cern-cds-media": "~2.1.4", - "drupal/cern-components": "~2.7.10", + "drupal/cern-components": "~2.7.13", "drupal/cern-dev-status": "~2.0.5", - "drupal/cern-display-formats": "~1.4.5", + "drupal/cern-display-formats": "~1.4.6", "drupal/cern-drupal-welcome-message-block": "~1.1.0", "drupal/cern-full-html-format": "~2.0.4", - "drupal/cern-indico-feeds": "~2.0.5", - "drupal/cern-install-profiles": "dev-k8s", + "drupal/cern-indico-feeds": "~2.0.5@alpha", + "drupal/cern-install-profiles": "~8.1.5", "drupal/cern-integration": "~1.0.0", - "drupal/cern-landing-page": "~2.2.4", + "drupal/cern-landing-page": "~2.2.4@beta", "drupal/cern-ldap-api": "~1.0.0", "drupal/cern-loading": "~2.1.2", "drupal/cern-paragraph-types": "~2.2.3", - "drupal/cern-profile-displayname": "~2.1.0", - "drupal/cern-theme": "~2.6.11", + "drupal/cern-profile-displayname": "~2.1.1", + "drupal/cern-theme": "~2.7.0", "drupal/cern-toolbar": "~2.2.3", "drupal/cern-webcast-feeds": "~2.0.4", "drupal/cern-webform-invitation": "~1.0.0", @@ -170,13 +170,13 @@ "drupal/config_update": "~1.7.0", "drupal/content_access": "~1.0.0@alpha", "drupal/context": "~4.0.0@beta", - "drupal/contribute": "~1.0.0@beta", + "drupal/contribute": "1.x-dev@dev", "drupal/cookieconsent": "~1.6.0", - "drupal/core-composer-scaffold": "8.9.18", - "drupal/core-project-message": "8.9.18", - "drupal/core-recommended": "8.9.18", + "drupal/core-composer-scaffold": "8.9.19", + "drupal/core-project-message": "8.9.19", + "drupal/core-recommended": "8.9.19", "drupal/ctools": "~3.6.0", - "drupal/devel": "~2.1.0", + "drupal/devel": "~4.1.1", "drupal/domain_301_redirect": "~1.0.0@alpha", "drupal/ds": "~3.12.0", "drupal/easy_breadcrumb": "~1.15.0", @@ -187,7 +187,7 @@ "drupal/externalauth": "~1.3.0", "drupal/extlink": "~1.6.0", "drupal/facets": "~1.7.0", - "drupal/fast_404": "~2.0.0@alpha", + "drupal/fast_404": "dev-2.x", "drupal/features": "~3.12.0", "drupal/feeds": "~3.0.0@alpha", "drupal/fences": "~2.0.0@rc", @@ -195,10 +195,10 @@ "drupal/field_group": "~3.1.0", "drupal/field_permissions": "~1.1.0", "drupal/filefield_paths": "~1.0.0@beta", - "drupal/honeypot": "~1.30.0", + "drupal/honeypot": "~2.0.1", "drupal/hook_event_dispatcher": "~1.29.0", "drupal/hotjar": "~2.0.0", - "drupal/imagemagick": "~2.7.0", + "drupal/imagemagick": "~3.2.0", "drupal/imce": "~2.3.0", "drupal/jquery_ui": "~1.4.0", "drupal/jquery_ui_draggable": "~1.2.0", @@ -211,7 +211,7 @@ "drupal/menu_breadcrumb": "~1.14.0", "drupal/menu_force": "~1.2.0", "drupal/metatag": "~1.16.0", - "drupal/migrate_plus": "~4.2.0", + "drupal/migrate_plus": "~5.1.0", "drupal/migrate_tools": "~4.5.0", "drupal/migrate_upgrade": "~3.2.0", "drupal/module_filter": "~3.2.0", @@ -222,27 +222,28 @@ "drupal/panels": "~4.6.0", "drupal/paragraphs": "~1.12.0", "drupal/pathauto": "~1.8.0", - "drupal/permissions_by_term": "~2.31.0", + "drupal/permissions_by_term": "^2.34", "drupal/piwik": "~1.4.0", - "drupal/recaptcha": "~2.5.0", + "drupal/recaptcha": "~3.0.0", "drupal/redirect": "~1.6.0", + "drupal/redis": "~1.5.0", "drupal/require_login": "~2.4.0", - "drupal/rules": "~3.0.0@alpha", + "drupal/rules": "3.x-dev", "drupal/scheduler": "~1.3.0", "drupal/search_api": "~1.19.0", "drupal/simplesamlphp_auth": "~3.2.0", "drupal/smart_trim": "~1.3.0", - "drupal/sticky": "~1.1.0", + "drupal/sticky": "~2.0.0", "drupal/token": "~1.9.0", "drupal/twig_tweak": "~2.9.0", "drupal/ui_patterns": "~1.2.0", "drupal/upgrade_status": "~3.11", "drupal/userprotect": "~1.1.0", - "drupal/views_bulk_operations": "~2.6.0", + "drupal/views_bulk_operations": "~4.0.0", "drupal/views_slideshow": "~4.8.0", - "drupal/views_taxonomy_term_name_depth": "^7.0", + "drupal/views_taxonomy_term_name_depth": "~7.0.2", "drupal/viewsreference": "~1.7.0", - "drupal/webform": "~5.25.0", + "drupal/webform": "^5.25", "drupal/webform_analysis": "~1.0.0@beta", "drupal/webform_invitation": "~1.1.0", "drupal/workbench": "~1.3.0", @@ -254,7 +255,7 @@ "wikimedia/composer-merge-plugin": "~2.0.1" }, "require-dev": { - "drupal/core-dev": "~8.9.18", + "drupal/core-dev": "~8.9.19", "zaporylie/composer-drupal-optimizations": "~1.2.0" }, "conflict": { diff --git a/composer.lock b/composer.lock index fa892c549205fdaaaa426211564d0386ceeb1b25..5b5c84b9b9fc36794371fb845435f2b8cc691227 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9e2f9e0ec9b7b5b8040084f7a61c7322", + "content-hash": "67d04180287d95ddb2792eea83823efc", "packages": [ { "name": "asm89/stack-cors", @@ -804,32 +804,32 @@ }, { "name": "consolidation/robo", - "version": "1.4.13", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "fd28dcca1b935950ece26e63541fbdeeb09f7343" + "reference": "12bf6b608057604a283e9e597edfed36ba071631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/fd28dcca1b935950ece26e63541fbdeeb09f7343", - "reference": "fd28dcca1b935950ece26e63541fbdeeb09f7343", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/12bf6b608057604a283e9e597edfed36ba071631", + "reference": "12bf6b608057604a283e9e597edfed36ba071631", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.12.1|^4.1", + "consolidation/annotated-command": "^2.12.1 || ^4.1", "consolidation/config": "^1.2.1", - "consolidation/log": "^1.1.1|^2", - "consolidation/output-formatters": "^3.5.1|^4.1", - "consolidation/self-update": "^1.1.5", + "consolidation/log": "^1.1.1 || ^2", + "consolidation/output-formatters": "^3.5.1 || ^4.1", + "consolidation/self-update": "^1.1.5 || ^2", "grasmash/yaml-expander": "^1.4", "league/container": "^2.4.1", "php": ">=5.5.0", - "symfony/console": "^2.8|^3|^4", - "symfony/event-dispatcher": "^2.5|^3|^4", - "symfony/filesystem": "^2.5|^3|^4", - "symfony/finder": "^2.5|^3|^4|^5", - "symfony/process": "^2.5|^3|^4" + "symfony/console": "^2.8 || ^3 || ^4", + "symfony/event-dispatcher": "^2.5 || ^3 || ^4", + "symfony/filesystem": "^2.5 || ^3 || ^4", + "symfony/finder": "^2.5 || ^3 || ^4 || ^5", + "symfony/process": "^2.5 || ^3 || ^4" }, "replace": { "codegyre/robo": "< 1.0" @@ -917,9 +917,9 @@ "description": "Modern task runner", "support": { "issues": "https://github.com/consolidation/Robo/issues", - "source": "https://github.com/consolidation/Robo/tree/1.4.13" + "source": "https://github.com/consolidation/Robo/tree/1.5.0" }, - "time": "2020-10-11T04:51:34+00:00" + "time": "2021-10-08T03:51:31+00:00" }, { "name": "consolidation/self-update", @@ -2349,13 +2349,12 @@ }, { "name": "drupal/cern-install-profiles", - "version": "dev-k8s", + "version": "8.1.5", "source": { "type": "git", "url": "https://gitlab.cern.ch/drupal/profiles.git", - "reference": "7710a2c7ff3d94146803285aea2f4c96a52493fe" + "reference": "3e36a5d9ee9b497e8c37caafc2426e532fc8a72c" }, - "default-branch": true, "type": "drupal-profile", "license": [ "Apache-v2" @@ -2367,7 +2366,7 @@ } ], "description": "Initialize the site with configuration that integrates it with the CERN environment", - "time": "2021-09-29T15:23:07+00:00" + "time": "2021-10-12T10:12:38+00:00" }, { "name": "drupal/cern-integration", @@ -2497,35 +2496,36 @@ }, { "name": "drupal/cern-profile-displayname", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://gitlab.cern.ch/web-team/drupal/public/d8/modules/cern-profile-displayname.git", - "reference": "1392ffebc377e627a22b6a817f2c342d126b93f2" - }, - "require": { - "drupal/simplesamlphp_auth": "^3.2" + "reference": "eff1c71cf767115d588b2c4d169399793074a0a5" }, "type": "drupal-custom-module", "license": [ "GPL-2.0-or-later" ], "authors": [ + { + "name": "Joachim Valdemar Yde", + "email": "joachim.git@cern.ch" + }, { "name": "Konstantinos Platis", "email": "konstantinos.platis@cern.ch" } ], - "description": "Overrides user login names with the SimpleSaml fullname attribute. Enables redirection to Profiles site.", - "time": "2021-02-11T10:01:34+00:00" + "description": "Overrides user login names with the fullname attribute. Enables redirection to Profiles site.", + "time": "2021-10-01T12:42:57+00:00" }, { "name": "drupal/cern-theme", - "version": "2.6.12", + "version": "2.7.0", "source": { "type": "git", "url": "https://gitlab.cern.ch/web-team/drupal/public/d8/themes/cern.git", - "reference": "408630b7b5e53086c2991653fa8a0d561f3166b2" + "reference": "9b10b4897eb768c4e5740689135f5e618fd9f621" }, "require": { "drupal/cern-base-theme": "^2.6.1" @@ -2541,7 +2541,7 @@ } ], "description": "Defines the CERN theme", - "time": "2021-04-27T12:37:58+00:00" + "time": "2021-05-19T09:18:30+00:00" }, { "name": "drupal/cern-toolbar", @@ -3196,35 +3196,32 @@ }, { "name": "drupal/contribute", - "version": "1.0.0-beta8", + "version": "dev-1.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/contribute.git", - "reference": "8.x-1.0-beta8" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/contribute-8.x-1.0-beta8.zip", - "reference": "8.x-1.0-beta8", - "shasum": "0f197e7ed0997818366d557a1c990d2c199e3565" + "reference": "8e0692ac28de695942cbf88677eae7b35dfcd7b9" }, "require": { - "drupal/core": "~8.0" + "drupal/core": "^8.7.7 || ^9.0" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, "drupal": { - "version": "8.x-1.0-beta8", - "datestamp": "1572372486", + "version": "8.x-1.0-beta8+4-dev", + "datestamp": "1588025707", "security-coverage": { "status": "not-covered", - "message": "Beta releases are not covered by Drupal security advisories." + "message": "Dev releases are not covered by Drupal security advisories." } } }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -3313,16 +3310,16 @@ }, { "name": "drupal/core", - "version": "8.9.18", + "version": "8.9.19", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "e536176c45d9d75ec57f7a12c0e3c0aead856841" + "reference": "96eb83b31d950f020cbc079ab960159c3735a033" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/e536176c45d9d75ec57f7a12c0e3c0aead856841", - "reference": "e536176c45d9d75ec57f7a12c0e3c0aead856841", + "url": "https://api.github.com/repos/drupal/core/zipball/96eb83b31d950f020cbc079ab960159c3735a033", + "reference": "96eb83b31d950f020cbc079ab960159c3735a033", "shasum": "" }, "require": { @@ -3541,13 +3538,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/8.9.18" + "source": "https://github.com/drupal/core/tree/8.9.19" }, - "time": "2021-08-12T17:48:42+00:00" + "time": "2021-09-14T22:08:18+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "8.9.18", + "version": "8.9.19", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -3591,13 +3588,13 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/8.9.5" + "source": "https://github.com/drupal/core-composer-scaffold/tree/8.9.4" }, "time": "2020-08-07T22:30:30+00:00" }, { "name": "drupal/core-project-message", - "version": "8.9.18", + "version": "8.9.19", "source": { "type": "git", "url": "https://github.com/drupal/core-project-message.git", @@ -3632,22 +3629,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-project-message/tree/8.9.18" + "source": "https://github.com/drupal/core-project-message/tree/8.9.4" }, "time": "2020-08-02T22:04:49+00:00" }, { "name": "drupal/core-recommended", - "version": "8.9.18", + "version": "8.9.19", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "71839bb9799b70f449b76294b461877ba1e9ff2c" + "reference": "880335bafeeba6d29454053bd24f253a219c2cfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/71839bb9799b70f449b76294b461877ba1e9ff2c", - "reference": "71839bb9799b70f449b76294b461877ba1e9ff2c", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/880335bafeeba6d29454053bd24f253a219c2cfc", + "reference": "880335bafeeba6d29454053bd24f253a219c2cfc", "shasum": "" }, "require": { @@ -3659,7 +3656,7 @@ "doctrine/common": "v2.7.3", "doctrine/inflector": "v1.2.0", "doctrine/lexer": "1.0.2", - "drupal/core": "8.9.18", + "drupal/core": "8.9.19", "easyrdf/easyrdf": "0.9.1", "egulias/email-validator": "2.1.17", "guzzlehttp/guzzle": "6.5.4", @@ -3717,9 +3714,9 @@ ], "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/8.9.18" + "source": "https://github.com/drupal/core-recommended/tree/8.9.19" }, - "time": "2021-08-12T17:48:42+00:00" + "time": "2021-09-14T22:08:18+00:00" }, { "name": "drupal/ctools", @@ -3890,27 +3887,37 @@ }, { "name": "drupal/devel", - "version": "2.1.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/devel.git", - "reference": "8.x-2.1" + "reference": "4.1.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/devel-8.x-2.1.zip", - "reference": "8.x-2.1", - "shasum": "8f735892922aa5f228e681e645e5f02b1c008f14" + "url": "https://ftp.drupal.org/files/projects/devel-4.1.1.zip", + "reference": "4.1.1", + "shasum": "88e5d49dda26a3136291ecd97bc6c8e897b24198" }, "require": { - "drupal/core": "~8.0", - "symfony/var-dumper": "~2.7|^3|^4" + "doctrine/common": "^2.7", + "drupal/core": "^8.8 || ^9", + "symfony/var-dumper": "^4 || ^5" + }, + "conflict": { + "kint-php/kint": "<3" + }, + "require-dev": { + "drush/drush": "^10" + }, + "suggest": { + "kint-php/kint": "Kint provides an informative display of arrays/objects. Useful for debugging and developing." }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.1", - "datestamp": "1556799496", + "version": "4.1.1", + "datestamp": "1631968537", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3918,48 +3925,30 @@ }, "drush": { "services": { - "drush.services.yml": "^9" + "drush.services.yml": "^9 || ^10" } } }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { - "name": "Moshe Weitzman", - "homepage": "https://github.com/weitzman", - "email": "weitzman@tejasa.com", - "role": "Maintainer" - }, - { - "name": "Hans Salvisberg", - "homepage": "https://www.drupal.org/u/salvis", - "email": "drupal@salvisberg.com", - "role": "Maintainer" - }, - { - "name": "Luca Lusso", - "homepage": "https://www.drupal.org/u/lussoluca", - "role": "Maintainer" - }, - { - "name": "Marco (willzyx)", - "homepage": "https://www.drupal.org/u/willzyx", - "role": "Maintainer" + "name": "drupalspoons", + "homepage": "https://www.drupal.org/user/3647684" }, { - "name": "See contributors", - "homepage": "https://www.drupal.org/node/3236/committers" + "name": "moshe weitzman", + "homepage": "https://www.drupal.org/user/23" } ], "description": "Various blocks, pages, and functions for developers.", - "homepage": "http://drupal.org/project/devel", + "homepage": "https://www.drupal.org/project/devel", "support": { - "source": "http://cgit.drupalcode.org/devel", - "issues": "http://drupal.org/project/devel", - "irc": "irc://irc.freenode.org/drupal-contribute" + "source": "https://gitlab.com/drupalspoons/devel", + "issues": "https://gitlab.com/drupalspoons/devel/-/issues", + "slack": "https://drupal.slack.com/archives/C012WAW1MH6" } }, { @@ -3976,6 +3965,9 @@ "reference": "8.x-1.0-alpha0", "shasum": "7b2756cdba8ecf8af052e9a6105530c1eaa2cfa5" }, + "require": { + "drupal/core": "~8.0" + }, "type": "drupal-module", "extra": { "drupal": { @@ -4186,6 +4178,9 @@ "reference": "8.x-3.4", "shasum": "6ec1848fd12b1515c16d841cc87a071883fa476c" }, + "require": { + "drupal/core": "^8" + }, "type": "drupal-module", "extra": { "drupal": { @@ -4636,29 +4631,26 @@ }, { "name": "drupal/fast_404", - "version": "2.0.0-alpha5", + "version": "dev-2.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/fast_404.git", - "reference": "8.x-2.0-alpha5" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/fast_404-8.x-2.0-alpha5.zip", - "reference": "8.x-2.0-alpha5", - "shasum": "071518c28f73ed011068ec0dbfe07a5904b8f982" + "reference": "5382a99335ee466f8261dc1774a3d56f1699da81" }, "require": { - "drupal/core": "^8.8" + "drupal/core": "^8.8 || ^9" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-2.x": "2.x-dev" + }, "drupal": { - "version": "8.x-2.0-alpha5", - "datestamp": "1590876049", + "version": "8.x-2.0-alpha5+6-dev", + "datestamp": "1600095923", "security-coverage": { "status": "not-covered", - "message": "Alpha releases are not covered by Drupal security advisories." + "message": "Dev releases are not covered by Drupal security advisories." } } }, @@ -5140,66 +5132,32 @@ }, { "name": "drupal/file_mdm", - "version": "dev-1.x", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/file_mdm.git", - "reference": "30264f78b6c6f98a614e2da8d1e0c843dce59472" - }, - "require": { - "drupal/core": "~8.0", - "lsolesen/pel": "0.9.6", - "phenx/php-font-lib": "^0.5", - "php": ">=5.6" - }, - "require-dev": { - "drupal/image_effects": "*" + "reference": "8.x-2.1" }, - "type": "drupal-module", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, - "drupal": { - "version": "8.x-1.1+8-dev", - "datestamp": "1576326787", - "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." - } - } + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/file_mdm-8.x-2.1.zip", + "reference": "8.x-2.1", + "shasum": "5c3d75622299ebddc0e8456bb08bb371da8771bd" }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "mondrake", - "homepage": "https://www.drupal.org/user/1307444" - } - ], - "description": "Provides a service to manage file metadata.", - "homepage": "https://www.drupal.org/project/file_mdm", - "support": { - "source": "https://git.drupalcode.org/project/file_mdm" - } - }, - { - "name": "drupal/file_mdm_exif", - "version": "1.1.0", "require": { - "drupal/core": "~8.0", - "drupal/file_mdm": "*" + "drupal/core": "^8.8 || ^9", + "lsolesen/pel": "^0.9.8", + "phenx/php-font-lib": "^0.5.2", + "php": ">=7" }, "require-dev": { "drupal/image_effects": "*" }, - "type": "metapackage", + "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.1", - "datestamp": "1488273785", + "version": "8.x-2.1", + "datestamp": "1586801064", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5216,7 +5174,7 @@ "homepage": "https://www.drupal.org/user/1307444" } ], - "description": "Provides a file metadata plugin for EXIF image information.", + "description": "Provides a service to manage file metadata.", "homepage": "https://www.drupal.org/project/file_mdm", "support": { "source": "https://git.drupalcode.org/project/file_mdm" @@ -5278,26 +5236,26 @@ }, { "name": "drupal/honeypot", - "version": "1.30.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/honeypot.git", - "reference": "8.x-1.30" + "reference": "2.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/honeypot-8.x-1.30.zip", - "reference": "8.x-1.30", - "shasum": "1d7983e8e07feee4f13e4b05c9a10db15ae2097e" + "url": "https://ftp.drupal.org/files/projects/honeypot-2.0.1.zip", + "reference": "2.0.1", + "shasum": "c29d248c0fdcdf733a31b9214355acfa73716632" }, "require": { - "drupal/core": "~8.0" + "drupal/core": "^8.0 || ^9.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.30", - "datestamp": "1576274288", + "version": "2.0.1", + "datestamp": "1597855128", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5306,7 +5264,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -5334,7 +5292,8 @@ "spam" ], "support": { - "source": "https://git.drupalcode.org/project/honeypot" + "source": "https://git.drupalcode.org/project/honeypot", + "issues": "https://www.drupal.org/project/issues/honeypot" } }, { @@ -5494,29 +5453,29 @@ }, { "name": "drupal/imagemagick", - "version": "2.7.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/imagemagick.git", - "reference": "8.x-2.7" + "reference": "8.x-3.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-2.7.zip", - "reference": "8.x-2.7", - "shasum": "e70fa0124305d99d5cf3f59d95c3e52657c1c8b4" + "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.2.zip", + "reference": "8.x-3.2", + "shasum": "35346cda3bb9c989387a282dd7f7bb4da4f70fce" }, "require": { - "drupal/core": "^8.3", - "drupal/file_mdm": "^1.1", - "drupal/file_mdm_exif": "^1.1", - "fileeye/mimemap": "^1.1.1" + "drupal/core": "^8.9 || ^9.1", + "drupal/file_mdm": "^2", + "drupal/sophron": "^1", + "php": ">=7.1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.7", - "datestamp": "1581425670", + "version": "8.x-3.2", + "datestamp": "1622711751", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6319,27 +6278,25 @@ }, { "name": "drupal/migrate_plus", - "version": "4.2.0", + "version": "5.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/migrate_plus.git", - "reference": "8.x-4.2" + "reference": "8.x-5.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/migrate_plus-8.x-4.2.zip", - "reference": "8.x-4.2", - "shasum": "5736a43e39cc5c091d54ceef2849ea35ba979af3" + "url": "https://ftp.drupal.org/files/projects/migrate_plus-8.x-5.1.zip", + "reference": "8.x-5.1", + "shasum": "1257427ab0c64459c3c1e42bb2a98d3114b77163" }, "require": { - "drupal/core": "^8.3" + "drupal/core": "^8.8 || ^9", + "php": ">=7.1" }, "require-dev": { - "drupal/entity": "*", "drupal/migrate_example_advanced_setup": "*", - "drupal/migrate_example_setup": "*", - "drupal/migrate_tools": "*", - "drupal/profile": "*" + "drupal/migrate_example_setup": "*" }, "suggest": { "ext-soap": "*", @@ -6348,8 +6305,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-4.2", - "datestamp": "1555683487", + "version": "8.x-5.1", + "datestamp": "1588261060", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6358,7 +6315,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -6367,16 +6324,17 @@ "role": "Maintainer" }, { - "name": "mikeryan", - "homepage": "https://www.drupal.org/user/4420" + "name": "Lucas Hedding", + "homepage": "https://www.drupal.org/u/heddn", + "role": "Maintainer" } ], "description": "Enhancements to core migration support.", "homepage": "https://www.drupal.org/project/migrate_plus", "support": { - "source": "https://cgit.drupalcode.org/migrate_plus", + "source": "https://git.drupalcode.org/project/migrate_plus", "issues": "https://www.drupal.org/project/issues/migrate_plus", - "irc": "irc://irc.freenode.org/drupal-migrate" + "slack": "#migrate" } }, { @@ -7137,17 +7095,17 @@ }, { "name": "drupal/permissions_by_term", - "version": "2.31.0", + "version": "2.34.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/permissions_by_term.git", - "reference": "8.x-2.31" + "reference": "8.x-2.34" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/permissions_by_term-8.x-2.31.zip", - "reference": "8.x-2.31", - "shasum": "b92e303e579937a6985d21751e72ad67a1d4404b" + "url": "https://ftp.drupal.org/files/projects/permissions_by_term-8.x-2.34.zip", + "reference": "8.x-2.34", + "shasum": "38233e447a83993ed660556d8b01534c3339c603" }, "require": { "drupal/core": "^8.0", @@ -7156,8 +7114,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.31", - "datestamp": "1614602591", + "version": "8.x-2.34", + "datestamp": "1626101135", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7204,6 +7162,7 @@ "shasum": "3692831f4b3de636e90679fb052ba8f30e49ac97" }, "require": { + "drupal/core": "~8.0", "drupal/matomo": "^1.0" }, "require-dev": { @@ -7244,27 +7203,28 @@ }, { "name": "drupal/recaptcha", - "version": "2.5.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/recaptcha.git", - "reference": "8.x-2.5" + "reference": "8.x-3.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/recaptcha-8.x-2.5.zip", - "reference": "8.x-2.5", - "shasum": "ffc4e334c2b09cb04b75fa9e0df3f63d1ebde0bc" + "url": "https://ftp.drupal.org/files/projects/recaptcha-8.x-3.0.zip", + "reference": "8.x-3.0", + "shasum": "5f1b179184b105ad6c121ab5505054e1e99331b9" }, "require": { "drupal/captcha": "^1.0.0-alpha1", - "drupal/core": "~8.0" + "drupal/core": "^8 || ^9", + "google/recaptcha": "^1.2" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.5", - "datestamp": "1580340616", + "version": "8.x-3.0", + "datestamp": "1591216085", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7376,6 +7336,62 @@ "source": "https://git.drupalcode.org/project/redirect" } }, + { + "name": "drupal/redis", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/redis.git", + "reference": "8.x-1.5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/redis-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "4283333dc2bf405045765b83ca662acc409a6543" + }, + "require": { + "drupal/core": "^8.8 || ^9" + }, + "suggest": { + "predis/predis": "^1.1.1" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.5", + "datestamp": "1609972488", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "autoload": { + "psr-4": { + "Drupal\\redis\\": "src" + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Berdir", + "homepage": "https://www.drupal.org/user/214652" + }, + { + "name": "pounard", + "homepage": "https://www.drupal.org/user/240164" + } + ], + "description": "Integration of Drupal with the Redis key-value store.", + "homepage": "https://www.drupal.org/project/redis", + "support": { + "source": "https://git.drupalcode.org/project/redis" + } + }, { "name": "drupal/require_login", "version": "2.4.0", @@ -7422,38 +7438,35 @@ }, { "name": "drupal/rules", - "version": "3.0.0-alpha6", + "version": "dev-3.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/rules.git", - "reference": "8.x-3.0-alpha6" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/rules-8.x-3.0-alpha6.zip", - "reference": "8.x-3.0-alpha6", - "shasum": "073bf5c23f0ef8f1aebf56538249d50d631d5a24" + "reference": "7092780804d0da79f09b0d140d117129e48cc71c" }, "require": { - "drupal/core": "^8.7", - "drupal/typed_data": "1.x-dev" + "drupal/core": "^8.8.2 || ^9", + "drupal/typed_data": "^1.0" }, "require-dev": { "drupal/typed_data": "1.x-dev" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-3.x": "3.x-dev" + }, "drupal": { - "version": "8.x-3.0-alpha6", - "datestamp": "1595975406", + "version": "8.x-3.x-dev", + "datestamp": "1623740127", "security-coverage": { "status": "not-covered", - "message": "Alpha releases are not covered by Drupal security advisories." + "message": "Dev releases are not covered by Drupal security advisories." } }, "drush": { "services": { - "drush.services.yml": "^9" + "drush.services.yml": "^9 || ^10" } } }, @@ -7750,27 +7763,78 @@ } }, { - "name": "drupal/sticky", + "name": "drupal/sophron", "version": "1.1.0", "source": { "type": "git", - "url": "https://git.drupalcode.org/project/sticky.git", + "url": "https://git.drupalcode.org/project/sophron.git", "reference": "8.x-1.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/sticky-8.x-1.1.zip", + "url": "https://ftp.drupal.org/files/projects/sophron-8.x-1.1.zip", "reference": "8.x-1.1", - "shasum": "98735598ba94c5ef2c0ae2ee77717174994724a4" + "shasum": "afb3650458b15b87918471defa763f24880622ca" }, "require": { - "drupal/core": "~8.0" + "drupal/core": "^8.9 || ^9", + "fileeye/mimemap": "^1.1.4", + "php": ">=7.1" }, "type": "drupal-module", "extra": { "drupal": { "version": "8.x-1.1", - "datestamp": "1491909243", + "datestamp": "1606047077", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "autoload": { + "psr-4": { + "Drupal\\sophron\\": "src/" + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "mondrake", + "homepage": "https://www.drupal.org/user/1307444" + } + ], + "description": "Provides an extensive MIME types management API", + "homepage": "https://www.drupal.org/project/sophron", + "support": { + "source": "https://git.drupalcode.org/project/sophron" + } + }, + { + "name": "drupal/sticky", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/sticky.git", + "reference": "2.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/sticky-2.0.0.zip", + "reference": "2.0.0", + "shasum": "26855934f046d6b95ca21544a581ae875157115f" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0", + "datestamp": "1627460893", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7917,31 +7981,29 @@ }, { "name": "drupal/typed_data", - "version": "dev-1.x", + "version": "1.0.0-alpha5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/typed_data.git", - "reference": "d6550fd64428642da9ace9281670e70f7018f0b1" + "reference": "8.x-1.0-alpha5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/typed_data-8.x-1.0-alpha5.zip", + "reference": "8.x-1.0-alpha5", + "shasum": "44cfaf8f6d6bc0b876e88a8b9d473799818d395f" }, "require": { - "drupal/core": "^8.8.2 || ^9" + "drupal/core": "^8.7.7 || ^9" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.0-alpha5+24-dev", - "datestamp": "1623702620", + "version": "8.x-1.0-alpha5", + "datestamp": "1591397037", "security-coverage": { "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." - } - }, - "drush": { - "services": { - "drush.services.yml": "^9 || ^10" + "message": "Alpha releases are not covered by Drupal security advisories." } } }, @@ -8213,26 +8275,32 @@ }, { "name": "drupal/views_bulk_operations", - "version": "2.6.0", + "version": "4.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "8.x-2.6" + "reference": "4.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-2.6.zip", - "reference": "8.x-2.6", - "shasum": "517b671adb55c3ad023032607d360dab77db9f22" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.0.0.zip", + "reference": "4.0.0", + "shasum": "d5bb4afeaaead0b8ebc7dd9e1fc6aac464aff4b1" }, "require": { - "drupal/core": "~8.5" + "drupal/core": "^8.8 || ^9" + }, + "require-dev": { + "drush/drush": "^10" + }, + "suggest": { + "drush/drush": "^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.6", - "datestamp": "1580924749", + "version": "4.0.0", + "datestamp": "1625650987", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8240,13 +8308,13 @@ }, "drush": { "services": { - "drush.services.yml": "^9" + "drush.services.yml": "^9 || ^10" } } }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -8273,7 +8341,7 @@ "description": "Adds an ability to perform bulk operations on selected entities from view results. Provides an API to create such operations.", "homepage": "https://www.drupal.org/project/views_bulk_operations", "support": { - "source": "https://git.drupalcode.org/project/views_bulk_operations", + "source": "https://git.drupalcode.org/project/views_bulk_operations/-/tree/8.x-3.x", "issues": "https://www.drupal.org/project/issues/views_bulk_operations?version=8.x", "docs": "https://www.drupal.org/docs/8/modules/views-bulk-operations-vbo" } @@ -8482,17 +8550,17 @@ }, { "name": "drupal/webform", - "version": "5.25.0", + "version": "5.28.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/webform.git", - "reference": "8.x-5.25" + "reference": "8.x-5.28" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/webform-8.x-5.25.zip", - "reference": "8.x-5.25", - "shasum": "115f8bc21549abc080543eb772166eb4fd2a162e" + "url": "https://ftp.drupal.org/files/projects/webform-8.x-5.28.zip", + "reference": "8.x-5.28", + "shasum": "31376657f81e50302cc6b89d5094e0b8a0810f57" }, "require": { "drupal/core": "^8.8" @@ -8533,8 +8601,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-5.25", - "datestamp": "1629907242", + "version": "8.x-5.28", + "datestamp": "1629909852", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8542,7 +8610,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9" + "drush.services.yml": "^9 || ^10" } } }, @@ -9458,6 +9526,58 @@ ], "time": "2021-07-14T15:03:58+00:00" }, + { + "name": "google/recaptcha", + "version": "1.2.4", + "source": { + "type": "git", + "url": "https://github.com/google/recaptcha.git", + "reference": "614f25a9038be4f3f2da7cbfd778dc5b357d2419" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/google/recaptcha/zipball/614f25a9038be4f3f2da7cbfd778dc5b357d2419", + "reference": "614f25a9038be4f3f2da7cbfd778dc5b357d2419", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.2.20|^2.15", + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^4.8.36|^5.7.27|^6.59|^7.5.11" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "ReCaptcha\\": "src/ReCaptcha" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Client library for reCAPTCHA, a free service that protects websites from spam and abuse.", + "homepage": "https://www.google.com/recaptcha/", + "keywords": [ + "Abuse", + "captcha", + "recaptcha", + "spam" + ], + "support": { + "forum": "https://groups.google.com/forum/#!forum/recaptcha", + "issues": "https://github.com/google/recaptcha/issues", + "source": "https://github.com/google/recaptcha" + }, + "time": "2020-03-31T17:50:54+00:00" + }, { "name": "graham-campbell/result-type", "version": "v1.0.2", @@ -10388,26 +10508,27 @@ }, { "name": "lsolesen/pel", - "version": "0.9.6", + "version": "0.9.10", "source": { "type": "git", - "url": "https://github.com/lsolesen/pel.git", - "reference": "c9e3919f5db3b85c3c422d4f8d448dbcb2a87a23" + "url": "https://github.com/pel/pel.git", + "reference": "04ecb8a29e4b1628414193b0df9294232a44f8a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lsolesen/pel/zipball/c9e3919f5db3b85c3c422d4f8d448dbcb2a87a23", - "reference": "c9e3919f5db3b85c3c422d4f8d448dbcb2a87a23", + "url": "https://api.github.com/repos/pel/pel/zipball/04ecb8a29e4b1628414193b0df9294232a44f8a9", + "reference": "04ecb8a29e4b1628414193b0df9294232a44f8a9", "shasum": "" }, "require": { - "php": ">=5.0.0" + "php": ">=7.1.0" }, "require-dev": { + "ext-exif": "*", "ext-gd": "*", - "phpunit/phpunit": "5.7.*", - "satooshi/php-coveralls": "1.0.*", - "squizlabs/php_codesniffer": "3.0.0RC3" + "php-coveralls/php-coveralls": ">2.4", + "squizlabs/php_codesniffer": ">3.5", + "symfony/phpunit-bridge": "^4 || ^5" }, "type": "library", "autoload": { @@ -10434,16 +10555,16 @@ } ], "description": "PHP Exif Library. A library for reading and writing Exif headers in JPEG and TIFF images using PHP.", - "homepage": "http://lsolesen.github.com/pel/", + "homepage": "http://pel.github.com/pel/", "keywords": [ "exif", "image" ], "support": { - "issues": "https://github.com/lsolesen/pel/issues", - "source": "https://github.com/lsolesen/pel/tree/master" + "issues": "https://github.com/pel/pel/issues", + "source": "https://github.com/pel/pel/tree/0.9.10" }, - "time": "2017-02-03T11:58:58+00:00" + "time": "2021-01-01T22:15:50+00:00" }, { "name": "masterminds/html5", @@ -10567,16 +10688,16 @@ }, { "name": "mglaman/phpstan-drupal", - "version": "0.12.13", + "version": "0.12.15", "source": { "type": "git", "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "c149cae44eeb1edddac72fe9c1c11449abab782e" + "reference": "1d65da838f3f5136e30e7a7023c235775f30c53e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/c149cae44eeb1edddac72fe9c1c11449abab782e", - "reference": "c149cae44eeb1edddac72fe9c1c11449abab782e", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/1d65da838f3f5136e30e7a7023c235775f30c53e", + "reference": "1d65da838f3f5136e30e7a7023c235775f30c53e", "shasum": "" }, "require": { @@ -10648,7 +10769,7 @@ "description": "Drupal extension and rules for PHPStan", "support": { "issues": "https://github.com/mglaman/phpstan-drupal/issues", - "source": "https://github.com/mglaman/phpstan-drupal/tree/0.12.13" + "source": "https://github.com/mglaman/phpstan-drupal/tree/0.12.15" }, "funding": [ { @@ -10664,7 +10785,7 @@ "type": "tidelift" } ], - "time": "2021-08-27T13:48:19+00:00" + "time": "2021-10-06T20:17:36+00:00" }, { "name": "nette/finder", @@ -11743,16 +11864,16 @@ }, { "name": "psy/psysh", - "version": "v0.10.8", + "version": "v0.10.9", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3" + "reference": "01281336c4ae557fe4a994544f30d3a1bc204375" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3", - "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/01281336c4ae557fe4a994544f30d3a1bc204375", + "reference": "01281336c4ae557fe4a994544f30d3a1bc204375", "shasum": "" }, "require": { @@ -11812,9 +11933,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.10.8" + "source": "https://github.com/bobthecow/psysh/tree/v0.10.9" }, - "time": "2021-04-10T16:23:39+00:00" + "time": "2021-10-10T13:37:39+00:00" }, { "name": "ralouphie/getallheaders", @@ -12329,6 +12450,7 @@ "issues": "https://github.com/simplesamlphp/simplesamlphp-module-authfacebook/issues", "source": "https://github.com/simplesamlphp/simplesamlphp-module-authfacebook" }, + "abandoned": true, "time": "2020-03-13T11:29:21+00:00" }, { @@ -12487,6 +12609,7 @@ "issues": "https://github.com/tvdijen/simplesamlphp-module-authwindowslive/issues", "source": "https://github.com/tvdijen/simplesamlphp-module-authwindowslive" }, + "abandoned": true, "time": "2019-12-03T09:01:13+00:00" }, { @@ -13272,6 +13395,7 @@ "issues": "https://github.com/simplesamlphp/simplesamlphp-module-oauth/issues", "source": "https://github.com/simplesamlphp/simplesamlphp-module-oauth/" }, + "abandoned": true, "time": "2021-08-31T18:55:00+00:00" }, { @@ -13682,16 +13806,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.6.0", + "version": "3.6.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625" + "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625", - "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f268ca40d54617c6e06757f83f699775c9b3ff2e", + "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e", "shasum": "" }, "require": { @@ -13734,7 +13858,7 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2021-04-09T00:54:41+00:00" + "time": "2021-10-11T04:00:11+00:00" }, { "name": "stack/builder", @@ -16588,26 +16712,27 @@ "packages-dev": [ { "name": "behat/mink", - "version": "v1.8.1", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/minkphp/Mink.git", - "reference": "07c6a9fe3fa98c2de074b25d9ed26c22904e3887" + "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/Mink/zipball/07c6a9fe3fa98c2de074b25d9ed26c22904e3887", - "reference": "07c6a9fe3fa98c2de074b25d9ed26c22904e3887", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/e35f4695de8800fc776af34ebf665ad58ebdd996", + "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996", "shasum": "" }, "require": { - "php": ">=5.3.1", + "php": ">=5.4", "symfony/css-selector": "^2.7|^3.0|^4.0|^5.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20", - "symfony/debug": "^2.7|^3.0|^4.0", - "symfony/phpunit-bridge": "^3.4.38 || ^5.0.5" + "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5 || ^9.5", + "symfony/debug": "^2.7|^3.0|^4.0|^5.0", + "symfony/phpunit-bridge": "^3.4.38 || ^4.4 || ^5.0.5", + "yoast/phpunit-polyfills": "^1.0" }, "suggest": { "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)", @@ -16619,7 +16744,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -16639,7 +16764,7 @@ } ], "description": "Browser controller/emulator abstraction for PHP", - "homepage": "http://mink.behat.org/", + "homepage": "https://mink.behat.org/", "keywords": [ "browser", "testing", @@ -16647,39 +16772,41 @@ ], "support": { "issues": "https://github.com/minkphp/Mink/issues", - "source": "https://github.com/minkphp/Mink/tree/v1.8.1" + "source": "https://github.com/minkphp/Mink/tree/v1.9.0" }, - "time": "2020-03-11T15:45:53+00:00" + "time": "2021-10-11T11:58:47+00:00" }, { "name": "behat/mink-browserkit-driver", - "version": "v1.3.4", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", - "reference": "e3b90840022ebcd544c7b394a3c9597ae242cbee" + "reference": "0ed1919eb09968f2e152ed91aee35300e70602a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/e3b90840022ebcd544c7b394a3c9597ae242cbee", - "reference": "e3b90840022ebcd544c7b394a3c9597ae242cbee", + "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/0ed1919eb09968f2e152ed91aee35300e70602a8", + "reference": "0ed1919eb09968f2e152ed91aee35300e70602a8", "shasum": "" }, "require": { "behat/mink": "^1.7.1@dev", - "php": ">=5.3.6", + "php": ">=5.4", "symfony/browser-kit": "~2.3|~3.0|~4.0", "symfony/dom-crawler": "~2.3|~3.0|~4.0" }, "require-dev": { "mink/driver-testsuite": "dev-master", + "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.18 || ^8.5 || ^9.5", "symfony/debug": "^2.7|^3.0|^4.0", - "symfony/http-kernel": "~2.3|~3.0|~4.0" + "symfony/http-kernel": "~2.3|~3.0|~4.0", + "yoast/phpunit-polyfills": "^1.0" }, "type": "mink-driver", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -16699,7 +16826,7 @@ } ], "description": "Symfony2 BrowserKit driver for Mink framework", - "homepage": "http://mink.behat.org/", + "homepage": "https://mink.behat.org/", "keywords": [ "Mink", "Symfony2", @@ -16708,37 +16835,36 @@ ], "support": { "issues": "https://github.com/minkphp/MinkBrowserKitDriver/issues", - "source": "https://github.com/minkphp/MinkBrowserKitDriver/tree/v1.3.4" + "source": "https://github.com/minkphp/MinkBrowserKitDriver/tree/v1.4.0" }, - "time": "2020-03-11T09:49:45+00:00" + "time": "2021-10-12T09:42:37+00:00" }, { "name": "behat/mink-goutte-driver", - "version": "v1.2.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/minkphp/MinkGoutteDriver.git", - "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca" + "reference": "8139f520f417c81bf9d2f9a171fff400f6adc9ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca", - "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca", + "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8139f520f417c81bf9d2f9a171fff400f6adc9ea", + "reference": "8139f520f417c81bf9d2f9a171fff400f6adc9ea", "shasum": "" }, "require": { - "behat/mink": "~1.6@dev", "behat/mink-browserkit-driver": "~1.2@dev", "fabpot/goutte": "~1.0.4|~2.0|~3.1", - "php": ">=5.3.1" + "php": ">=5.4" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7|~3.0" + "mink/driver-testsuite": "dev-master" }, "type": "mink-driver", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -16758,7 +16884,7 @@ } ], "description": "Goutte driver for Mink framework", - "homepage": "http://mink.behat.org/", + "homepage": "https://mink.behat.org/", "keywords": [ "browser", "goutte", @@ -16767,22 +16893,22 @@ ], "support": { "issues": "https://github.com/minkphp/MinkGoutteDriver/issues", - "source": "https://github.com/minkphp/MinkGoutteDriver/tree/master" + "source": "https://github.com/minkphp/MinkGoutteDriver/tree/v1.3.0" }, - "time": "2016-03-05T09:04:22+00:00" + "time": "2021-10-12T11:35:46+00:00" }, { "name": "behat/mink-selenium2-driver", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/minkphp/MinkSelenium2Driver.git", - "reference": "312a967dd527f28980cce40850339cd5316da092" + "reference": "0dee8cceed7e198bf130b4af0fab0ffab6dab47f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/312a967dd527f28980cce40850339cd5316da092", - "reference": "312a967dd527f28980cce40850339cd5316da092", + "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/0dee8cceed7e198bf130b4af0fab0ffab6dab47f", + "reference": "0dee8cceed7e198bf130b4af0fab0ffab6dab47f", "shasum": "" }, "require": { @@ -16796,7 +16922,7 @@ "type": "mink-driver", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -16821,7 +16947,7 @@ } ], "description": "Selenium2 (WebDriver) driver for Mink framework", - "homepage": "http://mink.behat.org/", + "homepage": "https://mink.behat.org/", "keywords": [ "ajax", "browser", @@ -16832,22 +16958,22 @@ ], "support": { "issues": "https://github.com/minkphp/MinkSelenium2Driver/issues", - "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.4.0" + "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.5.0" }, - "time": "2020-03-11T14:43:21+00:00" + "time": "2021-10-12T16:01:47+00:00" }, { "name": "composer/ca-bundle", - "version": "1.2.10", + "version": "1.2.11", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "9fdb22c2e97a614657716178093cd1da90a64aa8" + "reference": "0b072d51c5a9c6f3412f7ea3ab043d6603cb2582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/9fdb22c2e97a614657716178093cd1da90a64aa8", - "reference": "9fdb22c2e97a614657716178093cd1da90a64aa8", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0b072d51c5a9c6f3412f7ea3ab043d6603cb2582", + "reference": "0b072d51c5a9c6f3412f7ea3ab043d6603cb2582", "shasum": "" }, "require": { @@ -16859,7 +16985,7 @@ "phpstan/phpstan": "^0.12.55", "psr/log": "^1.0", "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" }, "type": "library", "extra": { @@ -16894,7 +17020,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.2.10" + "source": "https://github.com/composer/ca-bundle/tree/1.2.11" }, "funding": [ { @@ -16910,20 +17036,20 @@ "type": "tidelift" } ], - "time": "2021-06-07T13:58:28+00:00" + "time": "2021-09-25T20:32:43+00:00" }, { "name": "composer/composer", - "version": "1.10.22", + "version": "1.10.23", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "28c9dfbe2351635961f670773e8d7b17bc5eda25" + "reference": "eb3bae3d3de2e4abd94fa56fbe18355aba0b47ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/28c9dfbe2351635961f670773e8d7b17bc5eda25", - "reference": "28c9dfbe2351635961f670773e8d7b17bc5eda25", + "url": "https://api.github.com/repos/composer/composer/zipball/eb3bae3d3de2e4abd94fa56fbe18355aba0b47ae", + "reference": "eb3bae3d3de2e4abd94fa56fbe18355aba0b47ae", "shasum": "" }, "require": { @@ -16993,7 +17119,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/1.10.22" + "source": "https://github.com/composer/composer/tree/1.10.23" }, "funding": [ { @@ -17009,7 +17135,7 @@ "type": "tidelift" } ], - "time": "2021-04-27T11:10:45+00:00" + "time": "2021-10-05T07:44:27+00:00" }, { "name": "composer/spdx-licenses", @@ -17904,16 +18030,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { @@ -17924,7 +18050,8 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -17954,22 +18081,22 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2020-09-03T19:13:55+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f" + "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30f38bffc6f24293dadd1823936372dfa9e86e2f", - "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae", + "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae", "shasum": "" }, "require": { @@ -18004,9 +18131,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1" }, - "time": "2021-09-17T15:28:14+00:00" + "time": "2021-10-02T14:08:47+00:00" }, { "name": "phpspec/prophecy", @@ -19069,6 +19196,7 @@ "type": "github" } ], + "abandoned": true, "time": "2020-11-30T07:30:19+00:00" }, { @@ -19739,16 +19867,17 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/cern-install-profiles": 20, + "drupal/cern-indico-feeds": 15, + "drupal/cern-landing-page": 10, "drupal/content_access": 15, "drupal/context": 10, - "drupal/contribute": 10, + "drupal/contribute": 20, "drupal/domain_301_redirect": 15, - "drupal/fast_404": 15, + "drupal/fast_404": 20, "drupal/feeds": 15, "drupal/fences": 5, "drupal/filefield_paths": 10, - "drupal/rules": 15, + "drupal/rules": 20, "drupal/webform_analysis": 10, "drupal/workbench_access": 10 }, diff --git a/images/Dockerfile-composerbuilder b/images/Dockerfile-composerbuilder index 9acbc1a2b6cb4069bfd09e10b341e5ec2879b704..030f6b6896dd1c5ffc59905cbe9318dc4114144f 100644 --- a/images/Dockerfile-composerbuilder +++ b/images/Dockerfile-composerbuilder @@ -47,7 +47,13 @@ RUN set -eux; \ mysql-client \ ; \ \ + # install redis + pecl install -o -f redis \ + ; \ rm -rf /tmp/pear \ + ; \ + docker-php-ext-enable redis \ + ; \ \ docker-php-ext-configure gd \ diff --git a/images/drupal-operations-scripts/enable-or-disable-redis.sh b/images/drupal-operations-scripts/enable-or-disable-redis.sh new file mode 100644 index 0000000000000000000000000000000000000000..5d052582d78312ff6376e42070a5d86e0ef61fa7 --- /dev/null +++ b/images/drupal-operations-scripts/enable-or-disable-redis.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# Enable redis if it's a critical site +if [[ -z "${ENABLE_REDIS}" ]]; then + echo "ENABLE_REDIS module not set. Therefore uninstalling redis module." + drush cr + drush pm:uninstall -y redis + drush cr + drush pm:list | grep redis | grep Disabled + if [ $? -ne "0" ]; then + exit 1 + fi +else + echo "ENABLE_REDIS module is set. Therefore enabling redis module." + drush cr + drush pm:enable -y redis + drush cr + drush pm:list | grep redis | grep Enabled + if [ $? -ne "0" ]; then + exit 1 + fi +fi diff --git a/images/drupal-operations-scripts/ensure-site-install.sh b/images/drupal-operations-scripts/ensure-site-install.sh index 87a50cc86a3745f22b89a8128927d1275989b554..a142719fc1cbb3ee89e2ca544f04545bc52500b7 100755 --- a/images/drupal-operations-scripts/ensure-site-install.sh +++ b/images/drupal-operations-scripts/ensure-site-install.sh @@ -19,6 +19,11 @@ # Install Drupal site echo "Installing Drupal site" drush site-install cern -y --config-dir=../config/sync --account-name=admin install_configure_form.enable_update_status_emails=NULL -vvv +# We double check that cache does not interfere with user deletion, details can be seen here: https://gitlab.cern.ch/drupal/paas/cern-drupal-distribution/-/merge_requests/33 +drush cr +if [ "$?" -ne "0" ]; then + drush cr +fi # Remove admin account drush user-cancel admin -y drush cr diff --git a/images/nginx/config/default.conf b/images/nginx/config/default.conf index 27113c5d9a046307af1f514110910b75c52d154b..8242829cf7be9cd6e7696c4971a53bfcec016939 100644 --- a/images/nginx/config/default.conf +++ b/images/nginx/config/default.conf @@ -5,6 +5,8 @@ upstream webdav { server unix:/var/run/webdav.sock; } +#proxy_cache_path /var/cache/nginx keys_zone=one:10m max_size=200m; + server { #listen 8080 ssl; listen 8080; @@ -16,9 +18,34 @@ server { root /app/web; + # Add gzip compression + gzip on; + gzip_vary on; + gzip_min_length 1000; + gzip_comp_level 5; + gzip_types application/json text/css text/javascript application/x-javascript application/javascript image/svg+xml; + gzip_proxied any; + + sendfile on; + keepalive_timeout 25; + + etag off; + # Disables specifying the port in absolute redirects port_in_redirect off; + location / { + # try_files $uri @rewrite; # For Drupal <= 6 + try_files $uri /index.php?$query_string; # For Drupal >= 7 + } + + # https://drupal.stackexchange.com/questions/192151/cannot-install-any-theme + rewrite ^/core/authorize.php/core/authorize.php(.*)$ /core/authorize.php$1; + + location @rewrite { + rewrite ^/(.*)$ /index.php?q=$1; + } + location = /favicon.ico { log_not_found off; access_log off; @@ -108,15 +135,6 @@ server { return 403; } - location / { - # try_files $uri @rewrite; # For Drupal <= 6 - try_files $uri /index.php?$query_string; # For Drupal >= 7 - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - # Don't allow direct access to PHP files in the vendor directory. location ~ /vendor/.*\.php$ { deny all; @@ -167,20 +185,7 @@ server { location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { try_files $uri @rewrite; expires max; + access_log off; log_not_found off; } - - - location ^~ /simplesaml { - alias /app/vendor/simplesamlphp/simplesamlphp/www; - - location ~ ^(?<prefix>/simplesaml)(?<phpfile>.+?\.php)(?<pathinfo>/.*)?$ { - include fastcgi_params; - fastcgi_pass php; - fastcgi_index index.php; - fastcgi_split_path_info ^(.+?\.php)(/.+)$; - fastcgi_param SCRIPT_FILENAME $document_root$phpfile; - fastcgi_param PATH_INFO $pathinfo if_not_empty; - } - } } diff --git a/images/settings.php b/images/settings.php index eecb09fd85c75499c368cd472ce32ef73541053e..174171892312488685737707af446e4491e4d49f 100644 --- a/images/settings.php +++ b/images/settings.php @@ -65,9 +65,11 @@ // Set Redis as the default backend for any cache bin not otherwise specified. $settings['cache']['default'] = 'cache.backend.redis'; $settings['redis.connection']['interface'] = 'PhpRedis'; - $settings['redis.connection']['host'] = 'redis.' . getenv('NAMESPACE') . '.svc.cluster.local'; + //$settings['redis.connection']['host'] = 'redis.' . getenv('NAMESPACE') . '.svc.cluster.local'; + $settings['redis.connection']['host'] = getenv('REDIS_SERVICE_HOST'); $settings['redis.connection']['port'] = getenv('REDIS_SERVICE_PORT'); - + // NOTE: env `REDIS_PASSWORD` needs to be manually exposed + $settings['redis.connection']['password'] = getenv('REDIS_PASSWORD'); // Allow the services to work before the Redis module itself is enabled. $settings['container_yamls'][] = 'modules/contrib/redis/redis.services.yml'; // Manually add the classloader path, this is required for the container cache bin definition below @@ -148,4 +150,4 @@ // $databases['default']['default']['init_commands']['isolation'] = "SET SESSION tx_isolation='READ-COMMITTED'"; $databases['default']['default']['init_commands']['lock_wait_timeout'] = "SET SESSION innodb_lock_wait_timeout = 20"; $databases['default']['default']['init_commands']['wait_timeout'] = "SET SESSION wait_timeout = 600"; -// } \ No newline at end of file +// } diff --git a/images/softwareVersions b/images/softwareVersions index d7693f5d263e8fe9c43c2b1c95fd70bb8ac1f3d8..82f94cabf838d202d4d37733a4408f807bde9da4 100644 --- a/images/softwareVersions +++ b/images/softwareVersions @@ -4,4 +4,4 @@ nginx: '1.20.1' composer: '2.1.8' php: '7.3.23-fpm-alpine3.12' # This is instead the version of the composer builder that the sitebuilder will use. -composerBuilderTag: 'master-RELEASE-2021.10.06T01-02-31Z' +composerBuilderTag: 'perf-nginx-merge-bd2f8032' diff --git a/web/libraries/colorbutton/lang/de-ch.js b/web/libraries/colorbutton/lang/de-ch.js index 431d4339ee300a867601e7e35a6ca2bda3256901..70567673bb6ae7bc01daec027c2f6f5766aa7297 100644 --- a/web/libraries/colorbutton/lang/de-ch.js +++ b/web/libraries/colorbutton/lang/de-ch.js @@ -46,28 +46,28 @@ CKEDITOR.plugins.setLang( 'colorbutton', 'de-ch', { F0F8FF: 'Alice Blau', E6E6FA: 'Lavendel', FFF: 'Weiss', - '1ABC9C': 'Strong Cyan', // MISSING - '2ECC71': 'Emerald', // MISSING - '3498DB': 'Bright Blue', // MISSING - '9B59B6': 'Amethyst', // MISSING - '4E5F70': 'Grayish Blue', // MISSING - 'F1C40F': 'Vivid Yellow', // MISSING - '16A085': 'Dark Cyan', // MISSING - '27AE60': 'Dark Emerald', // MISSING - '2980B9': 'Strong Blue', // MISSING - '8E44AD': 'Dark Violet', // MISSING - '2C3E50': 'Desaturated Blue', // MISSING - 'F39C12': 'Orange', // MISSING - 'E67E22': 'Carrot', // MISSING - 'E74C3C': 'Pale Red', // MISSING - 'ECF0F1': 'Bright Silver', // MISSING - '95A5A6': 'Light Grayish Cyan', // MISSING - 'DDD': 'Light Gray', // MISSING - 'D35400': 'Pumpkin', // MISSING - 'C0392B': 'Strong Red', // MISSING - 'BDC3C7': 'Silver', // MISSING - '7F8C8D': 'Grayish Cyan', // MISSING - '999': 'Dark Gray' // MISSING + '1ABC9C': 'Kräftiges Türkis', + '2ECC71': 'Smaragdgrün', + '3498DB': 'Helles Blau', + '9B59B6': 'Amethystblau', + '4E5F70': 'Graublau', + 'F1C40F': 'Lebhaftes Gelb', + '16A085': 'Dunkeltürkis', + '27AE60': 'Dunkles Smaragdgrün', + '2980B9': 'Kräftiges Blau', + '8E44AD': 'Dunkelvilolett', + '2C3E50': 'Entsättigtes blau', + 'F39C12': 'Orange', + 'E67E22': 'Karotte', + 'E74C3C': 'Blassrot', + 'ECF0F1': 'Glänzendes Silber', + '95A5A6': 'Helles Graublau', + 'DDD': 'Hellgrau', + 'D35400': 'Kürbisfarben', + 'C0392B': 'Kräftiges Rot', + 'BDC3C7': 'Silber', + '7F8C8D': 'Graucyan', + '999': 'Dunkelgrau' }, more: 'Weitere Farben...', panelTitle: 'Farben', diff --git a/web/libraries/colorbutton/plugin.js b/web/libraries/colorbutton/plugin.js index efacf877b9ffcda75b1c3160cb76bda5aa4e9541..7954706a02ac53b5c8bcb8ea3534df21396b98cb 100644 --- a/web/libraries/colorbutton/plugin.js +++ b/web/libraries/colorbutton/plugin.js @@ -177,7 +177,7 @@ var colors = config.colorButton_colors.split( ',' ), color = CKEDITOR.tools.array.find( colors, callback ); - color = normalizeColor( color ); + color = ColorBox.normalizeColor( color ); selectColor( panelBlock, color ); panelBlock._.markFirstDisplayed(); @@ -192,6 +192,9 @@ // The block should not have scrollbars (https://dev.ckeditor.com/ticket/5933, https://dev.ckeditor.com/ticket/6056) block.element.getDocument().getBody().setStyle( 'overflow', 'hidden' ); + // First render of panel have a scrollbar, but it shouldn't (#4247). + block.element.getAscendant( { html: 1 } ).setStyle( 'overflow', 'hidden' ); + CKEDITOR.ui.fire( 'ready', this ); var keys = block.keys, @@ -254,7 +257,7 @@ element = element.getParent(); } - currentColor = normalizeColor( element.getComputedStyle( cssProperty ) ); + currentColor = ColorBox.normalizeColor( element.getComputedStyle( cssProperty ) ); finalColor = finalColor || currentColor; if ( finalColor !== currentColor ) { @@ -269,7 +272,7 @@ finalColor = ''; } if ( type == 'fore' ) { - colorData.automaticTextColor = '#' + normalizeColor( automaticColor ); + colorData.automaticTextColor = '#' + ColorBox.normalizeColor( automaticColor ); } colorData.selectionColor = finalColor ? '#' + finalColor : ''; @@ -464,25 +467,12 @@ for ( var i = 0; i < items.count(); i++ ) { var item = items.getItem( i ); - if ( color && color == normalizeColor( item.getAttribute( 'data-value' ) ) ) { + if ( color && color == ColorBox.normalizeColor( item.getAttribute( 'data-value' ) ) ) { item.setAttribute( 'aria-selected', true ); return; } } } - - /* - * Converts a CSS color value to an easily comparable form. - * - * @private - * @member CKEDITOR.plugins.colorbutton - * @param {String} color - * @returns {String} - */ - function normalizeColor( color ) { - // Replace 3-character hexadecimal notation with a 6-character hexadecimal notation (#1008). - return CKEDITOR.tools.normalizeHex( '#' + CKEDITOR.tools.convertRgbToHex( color || '' ) ).replace( /#/g, '' ); - } } } ); ColorBox = CKEDITOR.tools.createClass( { @@ -499,6 +489,39 @@ statics: { colorNames: function( editor ) { return editor.lang.colorbutton.colors; + }, + + /* + * Converts a CSS color value to an easily comparable form. + * + * The function supports most of the color formats: + * + * * named colors (e.g. `yellow`), + * * hex colors (e.g. `#FF0000` or `#F00`), + * * RGB/RGBA colors (e.g. `rgb( 255, 0, 10)` or `rgba( 100, 20, 50, .5 )`), + * * HSL/HSLA colors (e.g. `hsl( 100, 50%, 20%)` or `hsla( 100, 50%, 20%, 10%)`). + * + * @private + * @param {String} color + * @returns {String} Returns color in hex format, but without the hash at the beginning, e.g. `ff0000` for red. + */ + normalizeColor: function( color ) { + var alphaRegex = /^(rgb|hsl)a\(/g, + transparentRegex = /^rgba\((\s*0\s*,?){4}\)$/g, + isAlphaColor = alphaRegex.test( color ), + // Browsers tend to represent transparent color as rgba(0, 0, 0, 0), so we need to filter out this value. + isTransparentColor = transparentRegex.test( color ), + colorInstance; + + // For colors with alpha channel we need to use CKEDITOR.tools.color normalization (#4351). + if ( isAlphaColor && !isTransparentColor ) { + colorInstance = new CKEDITOR.tools.color( color ); + + return CKEDITOR.tools.normalizeHex( colorInstance.getHex() || '' ).replace( /#/g, '' ); + } + + // Replace 3-character hexadecimal notation with a 6-character hexadecimal notation (#1008). + return CKEDITOR.tools.normalizeHex( '#' + CKEDITOR.tools.convertRgbToHex( color || '' ) ).replace( /#/g, '' ); } }, @@ -628,7 +651,7 @@ getHexCode: function( span, cssProperty, list ) { var color = span.getStyle( cssProperty ); - return color in list ? list[ color ].substr( 1 ) : this._.normalizeColor( span.getComputedStyle( cssProperty ) ).toUpperCase(); + return color in list ? list[ color ].substr( 1 ) : ColorBox.normalizeColor( span.getComputedStyle( cssProperty ) ).toUpperCase(); }, sortByOccurrencesAscending: function( objectToParse, targetKeyName ) { @@ -747,10 +770,6 @@ CKEDITOR.tools.array.forEach( this.rows, function( row ) { this.container.append( row.getElement() ); }, this ); - }, - - normalizeColor: function( color ) { - return CKEDITOR.tools.normalizeHex( '#' + CKEDITOR.tools.convertRgbToHex( color || '' ) ).replace( /#/g, '' ); } }, diff --git a/web/libraries/jquery.cycle/jquery.cycle.all.js.2 b/web/libraries/jquery.cycle/jquery.cycle.all.js.2 new file mode 100644 index 0000000000000000000000000000000000000000..dc474ea0cb1da920daef85dfeae13c0ba706daff --- /dev/null +++ b/web/libraries/jquery.cycle/jquery.cycle.all.js.2 @@ -0,0 +1,1543 @@ +/*! + * jQuery Cycle Plugin (with Transition Definitions) + * Examples and documentation at: http://jquery.malsup.com/cycle/ + * Copyright (c) 2007-2013 M. Alsup + * Version: 3.0.3 (11-JUL-2013) + * Dual licensed under the MIT and GPL licenses. + * http://jquery.malsup.com/license.html + * Requires: jQuery v1.7.1 or later + */ +;(function($, undefined) { +"use strict"; + +var ver = '3.0.3'; + +function debug(s) { + if ($.fn.cycle.debug) + log(s); +} +function log() { + /*global console */ + if (window.console && console.log) + console.log('[cycle] ' + Array.prototype.join.call(arguments,' ')); +} +$.expr[':'].paused = function(el) { + return el.cyclePause; +}; + + +// the options arg can be... +// a number - indicates an immediate transition should occur to the given slide index +// a string - 'pause', 'resume', 'toggle', 'next', 'prev', 'stop', 'destroy' or the name of a transition effect (ie, 'fade', 'zoom', etc) +// an object - properties to control the slideshow +// +// the arg2 arg can be... +// the name of an fx (only used in conjunction with a numeric value for 'options') +// the value true (only used in first arg == 'resume') and indicates +// that the resume should occur immediately (not wait for next timeout) + +$.fn.cycle = function(options, arg2) { + var o = { s: this.selector, c: this.context }; + + // in 1.3+ we can fix mistakes with the ready state + if (this.length === 0 && options != 'stop') { + if (!$.isReady && o.s) { + log('DOM not ready, queuing slideshow'); + $(function() { + $(o.s,o.c).cycle(options,arg2); + }); + return this; + } + // is your DOM ready? http://docs.jquery.com/Tutorials:Introducing_$(document).ready() + log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)')); + return this; + } + + // iterate the matched nodeset + return this.each(function() { + var opts = handleArguments(this, options, arg2); + if (opts === false) + return; + + opts.updateActivePagerLink = opts.updateActivePagerLink || $.fn.cycle.updateActivePagerLink; + + // stop existing slideshow for this container (if there is one) + if (this.cycleTimeout) + clearTimeout(this.cycleTimeout); + this.cycleTimeout = this.cyclePause = 0; + this.cycleStop = 0; // issue #108 + + var $cont = $(this); + var $slides = opts.slideExpr ? $(opts.slideExpr, this) : $cont.children(); + var els = $slides.get(); + + if (els.length < 2) { + log('terminating; too few slides: ' + els.length); + return; + } + + var opts2 = buildOptions($cont, $slides, els, opts, o); + if (opts2 === false) + return; + + var startTime = opts2.continuous ? 10 : getTimeout(els[opts2.currSlide], els[opts2.nextSlide], opts2, !opts2.backwards); + + // if it's an auto slideshow, kick it off + if (startTime) { + startTime += (opts2.delay || 0); + if (startTime < 10) + startTime = 10; + debug('first timeout: ' + startTime); + this.cycleTimeout = setTimeout(function(){go(els,opts2,0,!opts.backwards);}, startTime); + } + }); +}; + +function triggerPause(cont, byHover, onPager) { + var opts = $(cont).data('cycle.opts'); + if (!opts) + return; + var paused = !!cont.cyclePause; + if (paused && opts.paused) + opts.paused(cont, opts, byHover, onPager); + else if (!paused && opts.resumed) + opts.resumed(cont, opts, byHover, onPager); +} + +// process the args that were passed to the plugin fn +function handleArguments(cont, options, arg2) { + if (cont.cycleStop === undefined) + cont.cycleStop = 0; + if (options === undefined || options === null) + options = {}; + if (options.constructor == String) { + switch(options) { + case 'destroy': + case 'stop': + var opts = $(cont).data('cycle.opts'); + if (!opts) + return false; + cont.cycleStop++; // callbacks look for change + if (cont.cycleTimeout) + clearTimeout(cont.cycleTimeout); + cont.cycleTimeout = 0; + if (opts.elements) + $(opts.elements).stop(); + $(cont).removeData('cycle.opts'); + if (options == 'destroy') + destroy(cont, opts); + return false; + case 'toggle': + cont.cyclePause = (cont.cyclePause === 1) ? 0 : 1; + checkInstantResume(cont.cyclePause, arg2, cont); + triggerPause(cont); + return false; + case 'pause': + cont.cyclePause = 1; + triggerPause(cont); + return false; + case 'resume': + cont.cyclePause = 0; + checkInstantResume(false, arg2, cont); + triggerPause(cont); + return false; + case 'prev': + case 'next': + opts = $(cont).data('cycle.opts'); + if (!opts) { + log('options not found, "prev/next" ignored'); + return false; + } + if (typeof arg2 == 'string') + opts.oneTimeFx = arg2; + $.fn.cycle[options](opts); + return false; + default: + options = { fx: options }; + } + return options; + } + else if (options.constructor == Number) { + // go to the requested slide + var num = options; + options = $(cont).data('cycle.opts'); + if (!options) { + log('options not found, can not advance slide'); + return false; + } + if (num < 0 || num >= options.elements.length) { + log('invalid slide index: ' + num); + return false; + } + options.nextSlide = num; + if (cont.cycleTimeout) { + clearTimeout(cont.cycleTimeout); + cont.cycleTimeout = 0; + } + if (typeof arg2 == 'string') + options.oneTimeFx = arg2; + go(options.elements, options, 1, num >= options.currSlide); + return false; + } + return options; + + function checkInstantResume(isPaused, arg2, cont) { + if (!isPaused && arg2 === true) { // resume now! + var options = $(cont).data('cycle.opts'); + if (!options) { + log('options not found, can not resume'); + return false; + } + if (cont.cycleTimeout) { + clearTimeout(cont.cycleTimeout); + cont.cycleTimeout = 0; + } + go(options.elements, options, 1, !options.backwards); + } + } +} + +function removeFilter(el, opts) { + if (!$.support.opacity && opts.cleartype && el.style.filter) { + try { el.style.removeAttribute('filter'); } + catch(smother) {} // handle old opera versions + } +} + +// unbind event handlers +function destroy(cont, opts) { + if (opts.next) + $(opts.next).unbind(opts.prevNextEvent); + if (opts.prev) + $(opts.prev).unbind(opts.prevNextEvent); + + if (opts.pager || opts.pagerAnchorBuilder) + $.each(opts.pagerAnchors || [], function() { + this.unbind().remove(); + }); + opts.pagerAnchors = null; + $(cont).unbind('mouseenter.cycle mouseleave.cycle'); + if (opts.destroy) // callback + opts.destroy(opts); +} + +// one-time initialization +function buildOptions($cont, $slides, els, options, o) { + var startingSlideSpecified; + // support metadata plugin (v1.0 and v2.0) + var opts = $.extend({}, $.fn.cycle.defaults, options || {}, $.metadata ? $cont.metadata() : $.meta ? $cont.data() : {}); + var meta = $.isFunction($cont.data) ? $cont.data(opts.metaAttr) : null; + if (meta) + opts = $.extend(opts, meta); + if (opts.autostop) + opts.countdown = opts.autostopCount || els.length; + + var cont = $cont[0]; + $cont.data('cycle.opts', opts); + opts.$cont = $cont; + opts.stopCount = cont.cycleStop; + opts.elements = els; + opts.before = opts.before ? [opts.before] : []; + opts.after = opts.after ? [opts.after] : []; + + // push some after callbacks + if (!$.support.opacity && opts.cleartype) + opts.after.push(function() { removeFilter(this, opts); }); + if (opts.continuous) + opts.after.push(function() { go(els,opts,0,!opts.backwards); }); + + saveOriginalOpts(opts); + + // clearType corrections + if (!$.support.opacity && opts.cleartype && !opts.cleartypeNoBg) + clearTypeFix($slides); + + // container requires non-static position so that slides can be position within + if ($cont.css('position') == 'static') + $cont.css('position', 'relative'); + if (opts.width) + $cont.width(opts.width); + if (opts.height && opts.height != 'auto') + $cont.height(opts.height); + + if (opts.startingSlide !== undefined) { + opts.startingSlide = parseInt(opts.startingSlide,10); + if (opts.startingSlide >= els.length || opts.startSlide < 0) + opts.startingSlide = 0; // catch bogus input + else + startingSlideSpecified = true; + } + else if (opts.backwards) + opts.startingSlide = els.length - 1; + else + opts.startingSlide = 0; + + // if random, mix up the slide array + if (opts.random) { + opts.randomMap = []; + for (var i = 0; i < els.length; i++) + opts.randomMap.push(i); + opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); + if (startingSlideSpecified) { + // try to find the specified starting slide and if found set start slide index in the map accordingly + for ( var cnt = 0; cnt < els.length; cnt++ ) { + if ( opts.startingSlide == opts.randomMap[cnt] ) { + opts.randomIndex = cnt; + } + } + } + else { + opts.randomIndex = 1; + opts.startingSlide = opts.randomMap[1]; + } + } + else if (opts.startingSlide >= els.length) + opts.startingSlide = 0; // catch bogus input + opts.currSlide = opts.startingSlide || 0; + var first = opts.startingSlide; + + // set position and zIndex on all the slides + $slides.css({position: 'absolute', top:0, left:0}).hide().each(function(i) { + var z; + if (opts.backwards) + z = first ? i <= first ? els.length + (i-first) : first-i : els.length-i; + else + z = first ? i >= first ? els.length - (i-first) : first-i : els.length-i; + $(this).css('z-index', z); + }); + + // make sure first slide is visible + $(els[first]).css('opacity',1).show(); // opacity bit needed to handle restart use case + removeFilter(els[first], opts); + + // stretch slides + if (opts.fit) { + if (!opts.aspect) { + if (opts.width) + $slides.width(opts.width); + if (opts.height && opts.height != 'auto') + $slides.height(opts.height); + } else { + $slides.each(function(){ + var $slide = $(this); + var ratio = (opts.aspect === true) ? $slide.width()/$slide.height() : opts.aspect; + if( opts.width && $slide.width() != opts.width ) { + $slide.width( opts.width ); + $slide.height( opts.width / ratio ); + } + + if( opts.height && $slide.height() < opts.height ) { + $slide.height( opts.height ); + $slide.width( opts.height * ratio ); + } + }); + } + } + + if (opts.center && ((!opts.fit) || opts.aspect)) { + $slides.each(function(){ + var $slide = $(this); + $slide.css({ + "margin-left": opts.width ? + ((opts.width - $slide.width()) / 2) + "px" : + 0, + "margin-top": opts.height ? + ((opts.height - $slide.height()) / 2) + "px" : + 0 + }); + }); + } + + if (opts.center && !opts.fit && !opts.slideResize) { + $slides.each(function(){ + var $slide = $(this); + $slide.css({ + "margin-left": opts.width ? ((opts.width - $slide.width()) / 2) + "px" : 0, + "margin-top": opts.height ? ((opts.height - $slide.height()) / 2) + "px" : 0 + }); + }); + } + + // stretch container + var reshape = (opts.containerResize || opts.containerResizeHeight) && $cont.innerHeight() < 1; + if (reshape) { // do this only if container has no size http://tinyurl.com/da2oa9 + var maxw = 0, maxh = 0; + for(var j=0; j < els.length; j++) { + var $e = $(els[j]), e = $e[0], w = $e.outerWidth(), h = $e.outerHeight(); + if (!w) w = e.offsetWidth || e.width || $e.attr('width'); + if (!h) h = e.offsetHeight || e.height || $e.attr('height'); + maxw = w > maxw ? w : maxw; + maxh = h > maxh ? h : maxh; + } + if (opts.containerResize && maxw > 0 && maxh > 0) + $cont.css({width:maxw+'px',height:maxh+'px'}); + if (opts.containerResizeHeight && maxh > 0) + $cont.css({height:maxh+'px'}); + } + + var pauseFlag = false; // https://github.com/malsup/cycle/issues/44 + if (opts.pause) + $cont.bind('mouseenter.cycle', function(){ + pauseFlag = true; + this.cyclePause++; + triggerPause(cont, true); + }).bind('mouseleave.cycle', function(){ + if (pauseFlag) + this.cyclePause--; + triggerPause(cont, true); + }); + + if (supportMultiTransitions(opts) === false) + return false; + + // apparently a lot of people use image slideshows without height/width attributes on the images. + // Cycle 2.50+ requires the sizing info for every slide; this block tries to deal with that. + var requeue = false; + options.requeueAttempts = options.requeueAttempts || 0; + $slides.each(function() { + // try to get height/width of each slide + var $el = $(this); + this.cycleH = (opts.fit && opts.height) ? opts.height : ($el.height() || this.offsetHeight || this.height || $el.attr('height') || 0); + this.cycleW = (opts.fit && opts.width) ? opts.width : ($el.width() || this.offsetWidth || this.width || $el.attr('width') || 0); + + if ( $el.is('img') ) { + var loading = (this.cycleH === 0 && this.cycleW === 0 && !this.complete); + // don't requeue for images that are still loading but have a valid size + if (loading) { + if (o.s && opts.requeueOnImageNotLoaded && ++options.requeueAttempts < 100) { // track retry count so we don't loop forever + log(options.requeueAttempts,' - img slide not loaded, requeuing slideshow: ', this.src, this.cycleW, this.cycleH); + setTimeout(function() {$(o.s,o.c).cycle(options);}, opts.requeueTimeout); + requeue = true; + return false; // break each loop + } + else { + log('could not determine size of image: '+this.src, this.cycleW, this.cycleH); + } + } + } + return true; + }); + + if (requeue) + return false; + + opts.cssBefore = opts.cssBefore || {}; + opts.cssAfter = opts.cssAfter || {}; + opts.cssFirst = opts.cssFirst || {}; + opts.animIn = opts.animIn || {}; + opts.animOut = opts.animOut || {}; + + $slides.not(':eq('+first+')').css(opts.cssBefore); + $($slides[first]).css(opts.cssFirst); + + if (opts.timeout) { + opts.timeout = parseInt(opts.timeout,10); + // ensure that timeout and speed settings are sane + if (opts.speed.constructor == String) + opts.speed = $.fx.speeds[opts.speed] || parseInt(opts.speed,10); + if (!opts.sync) + opts.speed = opts.speed / 2; + + var buffer = opts.fx == 'none' ? 0 : opts.fx == 'shuffle' ? 500 : 250; + while((opts.timeout - opts.speed) < buffer) // sanitize timeout + opts.timeout += opts.speed; + } + if (opts.easing) + opts.easeIn = opts.easeOut = opts.easing; + if (!opts.speedIn) + opts.speedIn = opts.speed; + if (!opts.speedOut) + opts.speedOut = opts.speed; + + opts.slideCount = els.length; + opts.currSlide = opts.lastSlide = first; + if (opts.random) { + if (++opts.randomIndex == els.length) + opts.randomIndex = 0; + opts.nextSlide = opts.randomMap[opts.randomIndex]; + } + else if (opts.backwards) + opts.nextSlide = opts.startingSlide === 0 ? (els.length-1) : opts.startingSlide-1; + else + opts.nextSlide = opts.startingSlide >= (els.length-1) ? 0 : opts.startingSlide+1; + + // run transition init fn + if (!opts.multiFx) { + var init = $.fn.cycle.transitions[opts.fx]; + if ($.isFunction(init)) + init($cont, $slides, opts); + else if (opts.fx != 'custom' && !opts.multiFx) { + log('unknown transition: ' + opts.fx,'; slideshow terminating'); + return false; + } + } + + // fire artificial events + var e0 = $slides[first]; + if (!opts.skipInitializationCallbacks) { + if (opts.before.length) + opts.before[0].apply(e0, [e0, e0, opts, true]); + if (opts.after.length) + opts.after[0].apply(e0, [e0, e0, opts, true]); + } + if (opts.next) + $(opts.next).bind(opts.prevNextEvent,function(){return advance(opts,1);}); + if (opts.prev) + $(opts.prev).bind(opts.prevNextEvent,function(){return advance(opts,0);}); + if (opts.pager || opts.pagerAnchorBuilder) + buildPager(els,opts); + + exposeAddSlide(opts, els); + + return opts; +} + +// save off original opts so we can restore after clearing state +function saveOriginalOpts(opts) { + opts.original = { before: [], after: [] }; + opts.original.cssBefore = $.extend({}, opts.cssBefore); + opts.original.cssAfter = $.extend({}, opts.cssAfter); + opts.original.animIn = $.extend({}, opts.animIn); + opts.original.animOut = $.extend({}, opts.animOut); + $.each(opts.before, function() { opts.original.before.push(this); }); + $.each(opts.after, function() { opts.original.after.push(this); }); +} + +function supportMultiTransitions(opts) { + var i, tx, txs = $.fn.cycle.transitions; + // look for multiple effects + if (opts.fx.indexOf(',') > 0) { + opts.multiFx = true; + opts.fxs = opts.fx.replace(/\s*/g,'').split(','); + // discard any bogus effect names + for (i=0; i < opts.fxs.length; i++) { + var fx = opts.fxs[i]; + tx = txs[fx]; + if (!tx || !txs.hasOwnProperty(fx) || !$.isFunction(tx)) { + log('discarding unknown transition: ',fx); + opts.fxs.splice(i,1); + i--; + } + } + // if we have an empty list then we threw everything away! + if (!opts.fxs.length) { + log('No valid transitions named; slideshow terminating.'); + return false; + } + } + else if (opts.fx == 'all') { // auto-gen the list of transitions + opts.multiFx = true; + opts.fxs = []; + for (var p in txs) { + if (txs.hasOwnProperty(p)) { + tx = txs[p]; + if (txs.hasOwnProperty(p) && $.isFunction(tx)) + opts.fxs.push(p); + } + } + } + if (opts.multiFx && opts.randomizeEffects) { + // munge the fxs array to make effect selection random + var r1 = Math.floor(Math.random() * 20) + 30; + for (i = 0; i < r1; i++) { + var r2 = Math.floor(Math.random() * opts.fxs.length); + opts.fxs.push(opts.fxs.splice(r2,1)[0]); + } + debug('randomized fx sequence: ',opts.fxs); + } + return true; +} + +// provide a mechanism for adding slides after the slideshow has started +function exposeAddSlide(opts, els) { + opts.addSlide = function(newSlide, prepend) { + var $s = $(newSlide), s = $s[0]; + if (!opts.autostopCount) + opts.countdown++; + els[prepend?'unshift':'push'](s); + if (opts.els) + opts.els[prepend?'unshift':'push'](s); // shuffle needs this + opts.slideCount = els.length; + + // add the slide to the random map and resort + if (opts.random) { + opts.randomMap.push(opts.slideCount-1); + opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); + } + + $s.css('position','absolute'); + $s[prepend?'prependTo':'appendTo'](opts.$cont); + + if (prepend) { + opts.currSlide++; + opts.nextSlide++; + } + + if (!$.support.opacity && opts.cleartype && !opts.cleartypeNoBg) + clearTypeFix($s); + + if (opts.fit && opts.width) + $s.width(opts.width); + if (opts.fit && opts.height && opts.height != 'auto') + $s.height(opts.height); + s.cycleH = (opts.fit && opts.height) ? opts.height : $s.height(); + s.cycleW = (opts.fit && opts.width) ? opts.width : $s.width(); + + $s.css(opts.cssBefore); + + if (opts.pager || opts.pagerAnchorBuilder) + $.fn.cycle.createPagerAnchor(els.length-1, s, $(opts.pager), els, opts); + + if ($.isFunction(opts.onAddSlide)) + opts.onAddSlide($s); + else + $s.hide(); // default behavior + }; +} + +// reset internal state; we do this on every pass in order to support multiple effects +$.fn.cycle.resetState = function(opts, fx) { + fx = fx || opts.fx; + opts.before = []; opts.after = []; + opts.cssBefore = $.extend({}, opts.original.cssBefore); + opts.cssAfter = $.extend({}, opts.original.cssAfter); + opts.animIn = $.extend({}, opts.original.animIn); + opts.animOut = $.extend({}, opts.original.animOut); + opts.fxFn = null; + $.each(opts.original.before, function() { opts.before.push(this); }); + $.each(opts.original.after, function() { opts.after.push(this); }); + + // re-init + var init = $.fn.cycle.transitions[fx]; + if ($.isFunction(init)) + init(opts.$cont, $(opts.elements), opts); +}; + +// this is the main engine fn, it handles the timeouts, callbacks and slide index mgmt +function go(els, opts, manual, fwd) { + var p = opts.$cont[0], curr = els[opts.currSlide], next = els[opts.nextSlide]; + + // opts.busy is true if we're in the middle of an animation + if (manual && opts.busy && opts.manualTrump) { + // let manual transitions requests trump active ones + debug('manualTrump in go(), stopping active transition'); + $(els).stop(true,true); + opts.busy = 0; + clearTimeout(p.cycleTimeout); + } + + // don't begin another timeout-based transition if there is one active + if (opts.busy) { + debug('transition active, ignoring new tx request'); + return; + } + + + // stop cycling if we have an outstanding stop request + if (p.cycleStop != opts.stopCount || p.cycleTimeout === 0 && !manual) + return; + + // check to see if we should stop cycling based on autostop options + if (!manual && !p.cyclePause && !opts.bounce && + ((opts.autostop && (--opts.countdown <= 0)) || + (opts.nowrap && !opts.random && opts.nextSlide < opts.currSlide))) { + if (opts.end) + opts.end(opts); + return; + } + + // if slideshow is paused, only transition on a manual trigger + var changed = false; + if ((manual || !p.cyclePause) && (opts.nextSlide != opts.currSlide)) { + changed = true; + var fx = opts.fx; + // keep trying to get the slide size if we don't have it yet + curr.cycleH = curr.cycleH || $(curr).height(); + curr.cycleW = curr.cycleW || $(curr).width(); + next.cycleH = next.cycleH || $(next).height(); + next.cycleW = next.cycleW || $(next).width(); + + // support multiple transition types + if (opts.multiFx) { + if (fwd && (opts.lastFx === undefined || ++opts.lastFx >= opts.fxs.length)) + opts.lastFx = 0; + else if (!fwd && (opts.lastFx === undefined || --opts.lastFx < 0)) + opts.lastFx = opts.fxs.length - 1; + fx = opts.fxs[opts.lastFx]; + } + + // one-time fx overrides apply to: $('div').cycle(3,'zoom'); + if (opts.oneTimeFx) { + fx = opts.oneTimeFx; + opts.oneTimeFx = null; + } + + $.fn.cycle.resetState(opts, fx); + + // run the before callbacks + if (opts.before.length) + $.each(opts.before, function(i,o) { + if (p.cycleStop != opts.stopCount) return; + o.apply(next, [curr, next, opts, fwd]); + }); + + // stage the after callacks + var after = function() { + opts.busy = 0; + $.each(opts.after, function(i,o) { + if (p.cycleStop != opts.stopCount) return; + o.apply(next, [curr, next, opts, fwd]); + }); + if (!p.cycleStop) { + // queue next transition + queueNext(); + } + }; + + debug('tx firing('+fx+'); currSlide: ' + opts.currSlide + '; nextSlide: ' + opts.nextSlide); + + // get ready to perform the transition + opts.busy = 1; + if (opts.fxFn) // fx function provided? + opts.fxFn(curr, next, opts, after, fwd, manual && opts.fastOnEvent); + else if ($.isFunction($.fn.cycle[opts.fx])) // fx plugin ? + $.fn.cycle[opts.fx](curr, next, opts, after, fwd, manual && opts.fastOnEvent); + else + $.fn.cycle.custom(curr, next, opts, after, fwd, manual && opts.fastOnEvent); + } + else { + queueNext(); + } + + if (changed || opts.nextSlide == opts.currSlide) { + // calculate the next slide + var roll; + opts.lastSlide = opts.currSlide; + if (opts.random) { + opts.currSlide = opts.nextSlide; + if (++opts.randomIndex == els.length) { + opts.randomIndex = 0; + opts.randomMap.sort(function(a,b) {return Math.random() - 0.5;}); + } + opts.nextSlide = opts.randomMap[opts.randomIndex]; + if (opts.nextSlide == opts.currSlide) + opts.nextSlide = (opts.currSlide == opts.slideCount - 1) ? 0 : opts.currSlide + 1; + } + else if (opts.backwards) { + roll = (opts.nextSlide - 1) < 0; + if (roll && opts.bounce) { + opts.backwards = !opts.backwards; + opts.nextSlide = 1; + opts.currSlide = 0; + } + else { + opts.nextSlide = roll ? (els.length-1) : opts.nextSlide-1; + opts.currSlide = roll ? 0 : opts.nextSlide+1; + } + } + else { // sequence + roll = (opts.nextSlide + 1) == els.length; + if (roll && opts.bounce) { + opts.backwards = !opts.backwards; + opts.nextSlide = els.length-2; + opts.currSlide = els.length-1; + } + else { + opts.nextSlide = roll ? 0 : opts.nextSlide+1; + opts.currSlide = roll ? els.length-1 : opts.nextSlide-1; + } + } + } + if (changed && opts.pager) + opts.updateActivePagerLink(opts.pager, opts.currSlide, opts.activePagerClass); + + function queueNext() { + // stage the next transition + var ms = 0, timeout = opts.timeout; + if (opts.timeout && !opts.continuous) { + ms = getTimeout(els[opts.currSlide], els[opts.nextSlide], opts, fwd); + if (opts.fx == 'shuffle') + ms -= opts.speedOut; + } + else if (opts.continuous && p.cyclePause) // continuous shows work off an after callback, not this timer logic + ms = 10; + if (ms > 0) + p.cycleTimeout = setTimeout(function(){ go(els, opts, 0, !opts.backwards); }, ms); + } +} + +// invoked after transition +$.fn.cycle.updateActivePagerLink = function(pager, currSlide, clsName) { + $(pager).each(function() { + $(this).children().removeClass(clsName).eq(currSlide).addClass(clsName); + }); +}; + +// calculate timeout value for current transition +function getTimeout(curr, next, opts, fwd) { + if (opts.timeoutFn) { + // call user provided calc fn + var t = opts.timeoutFn.call(curr,curr,next,opts,fwd); + while (opts.fx != 'none' && (t - opts.speed) < 250) // sanitize timeout + t += opts.speed; + debug('calculated timeout: ' + t + '; speed: ' + opts.speed); + if (t !== false) + return t; + } + return opts.timeout; +} + +// expose next/prev function, caller must pass in state +$.fn.cycle.next = function(opts) { advance(opts,1); }; +$.fn.cycle.prev = function(opts) { advance(opts,0);}; + +// advance slide forward or back +function advance(opts, moveForward) { + var val = moveForward ? 1 : -1; + var els = opts.elements; + var p = opts.$cont[0], timeout = p.cycleTimeout; + if (timeout) { + clearTimeout(timeout); + p.cycleTimeout = 0; + } + if (opts.random && val < 0) { + // move back to the previously display slide + opts.randomIndex--; + if (--opts.randomIndex == -2) + opts.randomIndex = els.length-2; + else if (opts.randomIndex == -1) + opts.randomIndex = els.length-1; + opts.nextSlide = opts.randomMap[opts.randomIndex]; + } + else if (opts.random) { + opts.nextSlide = opts.randomMap[opts.randomIndex]; + } + else { + opts.nextSlide = opts.currSlide + val; + if (opts.nextSlide < 0) { + if (opts.nowrap) return false; + opts.nextSlide = els.length - 1; + } + else if (opts.nextSlide >= els.length) { + if (opts.nowrap) return false; + opts.nextSlide = 0; + } + } + + var cb = opts.onPrevNextEvent || opts.prevNextClick; // prevNextClick is deprecated + if ($.isFunction(cb)) + cb(val > 0, opts.nextSlide, els[opts.nextSlide]); + go(els, opts, 1, moveForward); + return false; +} + +function buildPager(els, opts) { + var $p = $(opts.pager); + $.each(els, function(i,o) { + $.fn.cycle.createPagerAnchor(i,o,$p,els,opts); + }); + opts.updateActivePagerLink(opts.pager, opts.startingSlide, opts.activePagerClass); +} + +$.fn.cycle.createPagerAnchor = function(i, el, $p, els, opts) { + var a; + if ($.isFunction(opts.pagerAnchorBuilder)) { + a = opts.pagerAnchorBuilder(i,el); + debug('pagerAnchorBuilder('+i+', el) returned: ' + a); + } + else + a = '<a href="#">'+(i+1)+'</a>'; + + if (!a) + return; + var $a = $(a); + // don't reparent if anchor is in the dom + if ($a.parents('body').length === 0) { + var arr = []; + if ($p.length > 1) { + $p.each(function() { + var $clone = $a.clone(true); + $(this).append($clone); + arr.push($clone[0]); + }); + $a = $(arr); + } + else { + $a.appendTo($p); + } + } + + opts.pagerAnchors = opts.pagerAnchors || []; + opts.pagerAnchors.push($a); + + var pagerFn = function(e) { + e.preventDefault(); + opts.nextSlide = i; + var p = opts.$cont[0], timeout = p.cycleTimeout; + if (timeout) { + clearTimeout(timeout); + p.cycleTimeout = 0; + } + var cb = opts.onPagerEvent || opts.pagerClick; // pagerClick is deprecated + if ($.isFunction(cb)) + cb(opts.nextSlide, els[opts.nextSlide]); + go(els,opts,1,opts.currSlide < i); // trigger the trans +// return false; // <== allow bubble + }; + + if ( /mouseenter|mouseover/i.test(opts.pagerEvent) ) { + $a.hover(pagerFn, function(){/* no-op */} ); + } + else { + $a.bind(opts.pagerEvent, pagerFn); + } + + if ( ! /^click/.test(opts.pagerEvent) && !opts.allowPagerClickBubble) + $a.bind('click.cycle', function(){return false;}); // suppress click + + var cont = opts.$cont[0]; + var pauseFlag = false; // https://github.com/malsup/cycle/issues/44 + if (opts.pauseOnPagerHover) { + $a.hover( + function() { + pauseFlag = true; + cont.cyclePause++; + triggerPause(cont,true,true); + }, function() { + if (pauseFlag) + cont.cyclePause--; + triggerPause(cont,true,true); + } + ); + } +}; + +// helper fn to calculate the number of slides between the current and the next +$.fn.cycle.hopsFromLast = function(opts, fwd) { + var hops, l = opts.lastSlide, c = opts.currSlide; + if (fwd) + hops = c > l ? c - l : opts.slideCount - l; + else + hops = c < l ? l - c : l + opts.slideCount - c; + return hops; +}; + +// fix clearType problems in ie6 by setting an explicit bg color +// (otherwise text slides look horrible during a fade transition) +function clearTypeFix($slides) { + debug('applying clearType background-color hack'); + function hex(s) { + s = parseInt(s,10).toString(16); + return s.length < 2 ? '0'+s : s; + } + function getBg(e) { + for ( ; e && e.nodeName.toLowerCase() != 'html'; e = e.parentNode) { + var v = $.css(e,'background-color'); + if (v && v.indexOf('rgb') >= 0 ) { + var rgb = v.match(/\d+/g); + return '#'+ hex(rgb[0]) + hex(rgb[1]) + hex(rgb[2]); + } + if (v && v != 'transparent') + return v; + } + return '#ffffff'; + } + $slides.each(function() { $(this).css('background-color', getBg(this)); }); +} + +// reset common props before the next transition +$.fn.cycle.commonReset = function(curr,next,opts,w,h,rev) { + $(opts.elements).not(curr).hide(); + if (typeof opts.cssBefore.opacity == 'undefined') + opts.cssBefore.opacity = 1; + opts.cssBefore.display = 'block'; + if (opts.slideResize && w !== false && next.cycleW > 0) + opts.cssBefore.width = next.cycleW; + if (opts.slideResize && h !== false && next.cycleH > 0) + opts.cssBefore.height = next.cycleH; + opts.cssAfter = opts.cssAfter || {}; + opts.cssAfter.display = 'none'; + $(curr).css('zIndex',opts.slideCount + (rev === true ? 1 : 0)); + $(next).css('zIndex',opts.slideCount + (rev === true ? 0 : 1)); +}; + +// the actual fn for effecting a transition +$.fn.cycle.custom = function(curr, next, opts, cb, fwd, speedOverride) { + var $l = $(curr), $n = $(next); + var speedIn = opts.speedIn, speedOut = opts.speedOut, easeIn = opts.easeIn, easeOut = opts.easeOut, animInDelay = opts.animInDelay, animOutDelay = opts.animOutDelay; + $n.css(opts.cssBefore); + if (speedOverride) { + if (typeof speedOverride == 'number') + speedIn = speedOut = speedOverride; + else + speedIn = speedOut = 1; + easeIn = easeOut = null; + } + var fn = function() { + $n.delay(animInDelay).animate(opts.animIn, speedIn, easeIn, function() { + cb(); + }); + }; + $l.delay(animOutDelay).animate(opts.animOut, speedOut, easeOut, function() { + $l.css(opts.cssAfter); + if (!opts.sync) + fn(); + }); + if (opts.sync) fn(); +}; + +// transition definitions - only fade is defined here, transition pack defines the rest +$.fn.cycle.transitions = { + fade: function($cont, $slides, opts) { + $slides.not(':eq('+opts.currSlide+')').css('opacity',0); + opts.before.push(function(curr,next,opts) { + $.fn.cycle.commonReset(curr,next,opts); + opts.cssBefore.opacity = 0; + }); + opts.animIn = { opacity: 1 }; + opts.animOut = { opacity: 0 }; + opts.cssBefore = { top: 0, left: 0 }; + } +}; + +$.fn.cycle.ver = function() { return ver; }; + +// override these globally if you like (they are all optional) +$.fn.cycle.defaults = { + activePagerClass: 'activeSlide', // class name used for the active pager link + after: null, // transition callback (scope set to element that was shown): function(currSlideElement, nextSlideElement, options, forwardFlag) + allowPagerClickBubble: false, // allows or prevents click event on pager anchors from bubbling + animIn: null, // properties that define how the slide animates in + animInDelay: 0, // allows delay before next slide transitions in + animOut: null, // properties that define how the slide animates out + animOutDelay: 0, // allows delay before current slide transitions out + aspect: false, // preserve aspect ratio during fit resizing, cropping if necessary (must be used with fit option) + autostop: 0, // true to end slideshow after X transitions (where X == slide count) + autostopCount: 0, // number of transitions (optionally used with autostop to define X) + backwards: false, // true to start slideshow at last slide and move backwards through the stack + before: null, // transition callback (scope set to element to be shown): function(currSlideElement, nextSlideElement, options, forwardFlag) + center: null, // set to true to have cycle add top/left margin to each slide (use with width and height options) + cleartype: !$.support.opacity, // true if clearType corrections should be applied (for IE) + cleartypeNoBg: false, // set to true to disable extra cleartype fixing (leave false to force background color setting on slides) + containerResize: 1, // resize container to fit largest slide + containerResizeHeight: 0, // resize containers height to fit the largest slide but leave the width dynamic + continuous: 0, // true to start next transition immediately after current one completes + cssAfter: null, // properties that defined the state of the slide after transitioning out + cssBefore: null, // properties that define the initial state of the slide before transitioning in + delay: 0, // additional delay (in ms) for first transition (hint: can be negative) + easeIn: null, // easing for "in" transition + easeOut: null, // easing for "out" transition + easing: null, // easing method for both in and out transitions + end: null, // callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options) + fastOnEvent: 0, // force fast transitions when triggered manually (via pager or prev/next); value == time in ms + fit: 0, // force slides to fit container + fx: 'fade', // name of transition effect (or comma separated names, ex: 'fade,scrollUp,shuffle') + fxFn: null, // function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag) + height: 'auto', // container height (if the 'fit' option is true, the slides will be set to this height as well) + manualTrump: true, // causes manual transition to stop an active transition instead of being ignored + metaAttr: 'cycle', // data- attribute that holds the option data for the slideshow + next: null, // element, jQuery object, or jQuery selector string for the element to use as event trigger for next slide + nowrap: 0, // true to prevent slideshow from wrapping + onPagerEvent: null, // callback fn for pager events: function(zeroBasedSlideIndex, slideElement) + onPrevNextEvent: null, // callback fn for prev/next events: function(isNext, zeroBasedSlideIndex, slideElement) + pager: null, // element, jQuery object, or jQuery selector string for the element to use as pager container + pagerAnchorBuilder: null, // callback fn for building anchor links: function(index, DOMelement) + pagerEvent: 'click.cycle', // name of event which drives the pager navigation + pause: 0, // true to enable "pause on hover" + pauseOnPagerHover: 0, // true to pause when hovering over pager link + prev: null, // element, jQuery object, or jQuery selector string for the element to use as event trigger for previous slide + prevNextEvent: 'click.cycle',// event which drives the manual transition to the previous or next slide + random: 0, // true for random, false for sequence (not applicable to shuffle fx) + randomizeEffects: 1, // valid when multiple effects are used; true to make the effect sequence random + requeueOnImageNotLoaded: true, // requeue the slideshow if any image slides are not yet loaded + requeueTimeout: 250, // ms delay for requeue + rev: 0, // causes animations to transition in reverse (for effects that support it such as scrollHorz/scrollVert/shuffle) + shuffle: null, // coords for shuffle animation, ex: { top:15, left: 200 } + skipInitializationCallbacks: false, // set to true to disable the first before/after callback that occurs prior to any transition + slideExpr: null, // expression for selecting slides (if something other than all children is required) + slideResize: 1, // force slide width/height to fixed size before every transition + speed: 1000, // speed of the transition (any valid fx speed value) + speedIn: null, // speed of the 'in' transition + speedOut: null, // speed of the 'out' transition + startingSlide: undefined,// zero-based index of the first slide to be displayed + sync: 1, // true if in/out transitions should occur simultaneously + timeout: 4000, // milliseconds between slide transitions (0 to disable auto advance) + timeoutFn: null, // callback for determining per-slide timeout value: function(currSlideElement, nextSlideElement, options, forwardFlag) + updateActivePagerLink: null,// callback fn invoked to update the active pager link (adds/removes activePagerClass style) + width: null // container width (if the 'fit' option is true, the slides will be set to this width as well) +}; + +})(jQuery); + + +/*! + * jQuery Cycle Plugin Transition Definitions + * This script is a plugin for the jQuery Cycle Plugin + * Examples and documentation at: http://malsup.com/jquery/cycle/ + * Copyright (c) 2007-2010 M. Alsup + * Version: 2.73 + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + */ +(function($) { +"use strict"; + +// +// These functions define slide initialization and properties for the named +// transitions. To save file size feel free to remove any of these that you +// don't need. +// +$.fn.cycle.transitions.none = function($cont, $slides, opts) { + opts.fxFn = function(curr,next,opts,after){ + $(next).show(); + $(curr).hide(); + after(); + }; +}; + +// not a cross-fade, fadeout only fades out the top slide +$.fn.cycle.transitions.fadeout = function($cont, $slides, opts) { + $slides.not(':eq('+opts.currSlide+')').css({ display: 'block', 'opacity': 1 }); + opts.before.push(function(curr,next,opts,w,h,rev) { + $(curr).css('zIndex',opts.slideCount + (rev !== true ? 1 : 0)); + $(next).css('zIndex',opts.slideCount + (rev !== true ? 0 : 1)); + }); + opts.animIn.opacity = 1; + opts.animOut.opacity = 0; + opts.cssBefore.opacity = 1; + opts.cssBefore.display = 'block'; + opts.cssAfter.zIndex = 0; +}; + +// scrollUp/Down/Left/Right +$.fn.cycle.transitions.scrollUp = function($cont, $slides, opts) { + $cont.css('overflow','hidden'); + opts.before.push($.fn.cycle.commonReset); + var h = $cont.height(); + opts.cssBefore.top = h; + opts.cssBefore.left = 0; + opts.cssFirst.top = 0; + opts.animIn.top = 0; + opts.animOut.top = -h; +}; +$.fn.cycle.transitions.scrollDown = function($cont, $slides, opts) { + $cont.css('overflow','hidden'); + opts.before.push($.fn.cycle.commonReset); + var h = $cont.height(); + opts.cssFirst.top = 0; + opts.cssBefore.top = -h; + opts.cssBefore.left = 0; + opts.animIn.top = 0; + opts.animOut.top = h; +}; +$.fn.cycle.transitions.scrollLeft = function($cont, $slides, opts) { + $cont.css('overflow','hidden'); + opts.before.push($.fn.cycle.commonReset); + var w = $cont.width(); + opts.cssFirst.left = 0; + opts.cssBefore.left = w; + opts.cssBefore.top = 0; + opts.animIn.left = 0; + opts.animOut.left = 0-w; +}; +$.fn.cycle.transitions.scrollRight = function($cont, $slides, opts) { + $cont.css('overflow','hidden'); + opts.before.push($.fn.cycle.commonReset); + var w = $cont.width(); + opts.cssFirst.left = 0; + opts.cssBefore.left = -w; + opts.cssBefore.top = 0; + opts.animIn.left = 0; + opts.animOut.left = w; +}; +$.fn.cycle.transitions.scrollHorz = function($cont, $slides, opts) { + $cont.css('overflow','hidden').width(); + opts.before.push(function(curr, next, opts, fwd) { + if (opts.rev) + fwd = !fwd; + $.fn.cycle.commonReset(curr,next,opts); + opts.cssBefore.left = fwd ? (next.cycleW-1) : (1-next.cycleW); + opts.animOut.left = fwd ? -curr.cycleW : curr.cycleW; + }); + opts.cssFirst.left = 0; + opts.cssBefore.top = 0; + opts.animIn.left = 0; + opts.animOut.top = 0; +}; +$.fn.cycle.transitions.scrollVert = function($cont, $slides, opts) { + $cont.css('overflow','hidden'); + opts.before.push(function(curr, next, opts, fwd) { + if (opts.rev) + fwd = !fwd; + $.fn.cycle.commonReset(curr,next,opts); + opts.cssBefore.top = fwd ? (1-next.cycleH) : (next.cycleH-1); + opts.animOut.top = fwd ? curr.cycleH : -curr.cycleH; + }); + opts.cssFirst.top = 0; + opts.cssBefore.left = 0; + opts.animIn.top = 0; + opts.animOut.left = 0; +}; + +// slideX/slideY +$.fn.cycle.transitions.slideX = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $(opts.elements).not(curr).hide(); + $.fn.cycle.commonReset(curr,next,opts,false,true); + opts.animIn.width = next.cycleW; + }); + opts.cssBefore.left = 0; + opts.cssBefore.top = 0; + opts.cssBefore.width = 0; + opts.animIn.width = 'show'; + opts.animOut.width = 0; +}; +$.fn.cycle.transitions.slideY = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $(opts.elements).not(curr).hide(); + $.fn.cycle.commonReset(curr,next,opts,true,false); + opts.animIn.height = next.cycleH; + }); + opts.cssBefore.left = 0; + opts.cssBefore.top = 0; + opts.cssBefore.height = 0; + opts.animIn.height = 'show'; + opts.animOut.height = 0; +}; + +// shuffle +$.fn.cycle.transitions.shuffle = function($cont, $slides, opts) { + var i, w = $cont.css('overflow', 'visible').width(); + $slides.css({left: 0, top: 0}); + opts.before.push(function(curr,next,opts) { + $.fn.cycle.commonReset(curr,next,opts,true,true,true); + }); + // only adjust speed once! + if (!opts.speedAdjusted) { + opts.speed = opts.speed / 2; // shuffle has 2 transitions + opts.speedAdjusted = true; + } + opts.random = 0; + opts.shuffle = opts.shuffle || {left:-w, top:15}; + opts.els = []; + for (i=0; i < $slides.length; i++) + opts.els.push($slides[i]); + + for (i=0; i < opts.currSlide; i++) + opts.els.push(opts.els.shift()); + + // custom transition fn (hat tip to Benjamin Sterling for this bit of sweetness!) + opts.fxFn = function(curr, next, opts, cb, fwd) { + if (opts.rev) + fwd = !fwd; + var $el = fwd ? $(curr) : $(next); + $(next).css(opts.cssBefore); + var count = opts.slideCount; + $el.animate(opts.shuffle, opts.speedIn, opts.easeIn, function() { + var hops = $.fn.cycle.hopsFromLast(opts, fwd); + for (var k=0; k < hops; k++) { + if (fwd) + opts.els.push(opts.els.shift()); + else + opts.els.unshift(opts.els.pop()); + } + if (fwd) { + for (var i=0, len=opts.els.length; i < len; i++) + $(opts.els[i]).css('z-index', len-i+count); + } + else { + var z = $(curr).css('z-index'); + $el.css('z-index', parseInt(z,10)+1+count); + } + $el.animate({left:0, top:0}, opts.speedOut, opts.easeOut, function() { + $(fwd ? this : curr).hide(); + if (cb) cb(); + }); + }); + }; + $.extend(opts.cssBefore, { display: 'block', opacity: 1, top: 0, left: 0 }); +}; + +// turnUp/Down/Left/Right +$.fn.cycle.transitions.turnUp = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,false); + opts.cssBefore.top = next.cycleH; + opts.animIn.height = next.cycleH; + opts.animOut.width = next.cycleW; + }); + opts.cssFirst.top = 0; + opts.cssBefore.left = 0; + opts.cssBefore.height = 0; + opts.animIn.top = 0; + opts.animOut.height = 0; +}; +$.fn.cycle.transitions.turnDown = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,false); + opts.animIn.height = next.cycleH; + opts.animOut.top = curr.cycleH; + }); + opts.cssFirst.top = 0; + opts.cssBefore.left = 0; + opts.cssBefore.top = 0; + opts.cssBefore.height = 0; + opts.animOut.height = 0; +}; +$.fn.cycle.transitions.turnLeft = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,true); + opts.cssBefore.left = next.cycleW; + opts.animIn.width = next.cycleW; + }); + opts.cssBefore.top = 0; + opts.cssBefore.width = 0; + opts.animIn.left = 0; + opts.animOut.width = 0; +}; +$.fn.cycle.transitions.turnRight = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,true); + opts.animIn.width = next.cycleW; + opts.animOut.left = curr.cycleW; + }); + $.extend(opts.cssBefore, { top: 0, left: 0, width: 0 }); + opts.animIn.left = 0; + opts.animOut.width = 0; +}; + +// zoom +$.fn.cycle.transitions.zoom = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,false,true); + opts.cssBefore.top = next.cycleH/2; + opts.cssBefore.left = next.cycleW/2; + $.extend(opts.animIn, { top: 0, left: 0, width: next.cycleW, height: next.cycleH }); + $.extend(opts.animOut, { width: 0, height: 0, top: curr.cycleH/2, left: curr.cycleW/2 }); + }); + opts.cssFirst.top = 0; + opts.cssFirst.left = 0; + opts.cssBefore.width = 0; + opts.cssBefore.height = 0; +}; + +// fadeZoom +$.fn.cycle.transitions.fadeZoom = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,false); + opts.cssBefore.left = next.cycleW/2; + opts.cssBefore.top = next.cycleH/2; + $.extend(opts.animIn, { top: 0, left: 0, width: next.cycleW, height: next.cycleH }); + }); + opts.cssBefore.width = 0; + opts.cssBefore.height = 0; + opts.animOut.opacity = 0; +}; + +// blindX +$.fn.cycle.transitions.blindX = function($cont, $slides, opts) { + var w = $cont.css('overflow','hidden').width(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts); + opts.animIn.width = next.cycleW; + opts.animOut.left = curr.cycleW; + }); + opts.cssBefore.left = w; + opts.cssBefore.top = 0; + opts.animIn.left = 0; + opts.animOut.left = w; +}; +// blindY +$.fn.cycle.transitions.blindY = function($cont, $slides, opts) { + var h = $cont.css('overflow','hidden').height(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts); + opts.animIn.height = next.cycleH; + opts.animOut.top = curr.cycleH; + }); + opts.cssBefore.top = h; + opts.cssBefore.left = 0; + opts.animIn.top = 0; + opts.animOut.top = h; +}; +// blindZ +$.fn.cycle.transitions.blindZ = function($cont, $slides, opts) { + var h = $cont.css('overflow','hidden').height(); + var w = $cont.width(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts); + opts.animIn.height = next.cycleH; + opts.animOut.top = curr.cycleH; + }); + opts.cssBefore.top = h; + opts.cssBefore.left = w; + opts.animIn.top = 0; + opts.animIn.left = 0; + opts.animOut.top = h; + opts.animOut.left = w; +}; + +// growX - grow horizontally from centered 0 width +$.fn.cycle.transitions.growX = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,true); + opts.cssBefore.left = this.cycleW/2; + opts.animIn.left = 0; + opts.animIn.width = this.cycleW; + opts.animOut.left = 0; + }); + opts.cssBefore.top = 0; + opts.cssBefore.width = 0; +}; +// growY - grow vertically from centered 0 height +$.fn.cycle.transitions.growY = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,false); + opts.cssBefore.top = this.cycleH/2; + opts.animIn.top = 0; + opts.animIn.height = this.cycleH; + opts.animOut.top = 0; + }); + opts.cssBefore.height = 0; + opts.cssBefore.left = 0; +}; + +// curtainX - squeeze in both edges horizontally +$.fn.cycle.transitions.curtainX = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,false,true,true); + opts.cssBefore.left = next.cycleW/2; + opts.animIn.left = 0; + opts.animIn.width = this.cycleW; + opts.animOut.left = curr.cycleW/2; + opts.animOut.width = 0; + }); + opts.cssBefore.top = 0; + opts.cssBefore.width = 0; +}; +// curtainY - squeeze in both edges vertically +$.fn.cycle.transitions.curtainY = function($cont, $slides, opts) { + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,false,true); + opts.cssBefore.top = next.cycleH/2; + opts.animIn.top = 0; + opts.animIn.height = next.cycleH; + opts.animOut.top = curr.cycleH/2; + opts.animOut.height = 0; + }); + opts.cssBefore.height = 0; + opts.cssBefore.left = 0; +}; + +// cover - curr slide covered by next slide +$.fn.cycle.transitions.cover = function($cont, $slides, opts) { + var d = opts.direction || 'left'; + var w = $cont.css('overflow','hidden').width(); + var h = $cont.height(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts); + opts.cssAfter.display = ''; + if (d == 'right') + opts.cssBefore.left = -w; + else if (d == 'up') + opts.cssBefore.top = h; + else if (d == 'down') + opts.cssBefore.top = -h; + else + opts.cssBefore.left = w; + }); + opts.animIn.left = 0; + opts.animIn.top = 0; + opts.cssBefore.top = 0; + opts.cssBefore.left = 0; +}; + +// uncover - curr slide moves off next slide +$.fn.cycle.transitions.uncover = function($cont, $slides, opts) { + var d = opts.direction || 'left'; + var w = $cont.css('overflow','hidden').width(); + var h = $cont.height(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,true,true); + if (d == 'right') + opts.animOut.left = w; + else if (d == 'up') + opts.animOut.top = -h; + else if (d == 'down') + opts.animOut.top = h; + else + opts.animOut.left = -w; + }); + opts.animIn.left = 0; + opts.animIn.top = 0; + opts.cssBefore.top = 0; + opts.cssBefore.left = 0; +}; + +// toss - move top slide and fade away +$.fn.cycle.transitions.toss = function($cont, $slides, opts) { + var w = $cont.css('overflow','visible').width(); + var h = $cont.height(); + opts.before.push(function(curr, next, opts) { + $.fn.cycle.commonReset(curr,next,opts,true,true,true); + // provide default toss settings if animOut not provided + if (!opts.animOut.left && !opts.animOut.top) + $.extend(opts.animOut, { left: w*2, top: -h/2, opacity: 0 }); + else + opts.animOut.opacity = 0; + }); + opts.cssBefore.left = 0; + opts.cssBefore.top = 0; + opts.animIn.left = 0; +}; + +// wipe - clip animation +$.fn.cycle.transitions.wipe = function($cont, $slides, opts) { + var w = $cont.css('overflow','hidden').width(); + var h = $cont.height(); + opts.cssBefore = opts.cssBefore || {}; + var clip; + if (opts.clip) { + if (/l2r/.test(opts.clip)) + clip = 'rect(0px 0px '+h+'px 0px)'; + else if (/r2l/.test(opts.clip)) + clip = 'rect(0px '+w+'px '+h+'px '+w+'px)'; + else if (/t2b/.test(opts.clip)) + clip = 'rect(0px '+w+'px 0px 0px)'; + else if (/b2t/.test(opts.clip)) + clip = 'rect('+h+'px '+w+'px '+h+'px 0px)'; + else if (/zoom/.test(opts.clip)) { + var top = parseInt(h/2,10); + var left = parseInt(w/2,10); + clip = 'rect('+top+'px '+left+'px '+top+'px '+left+'px)'; + } + } + + opts.cssBefore.clip = opts.cssBefore.clip || clip || 'rect(0px 0px 0px 0px)'; + + var d = opts.cssBefore.clip.match(/(\d+)/g); + var t = parseInt(d[0],10), r = parseInt(d[1],10), b = parseInt(d[2],10), l = parseInt(d[3],10); + + opts.before.push(function(curr, next, opts) { + if (curr == next) return; + var $curr = $(curr), $next = $(next); + $.fn.cycle.commonReset(curr,next,opts,true,true,false); + opts.cssAfter.display = 'block'; + + var step = 1, count = parseInt((opts.speedIn / 13),10) - 1; + (function f() { + var tt = t ? t - parseInt(step * (t/count),10) : 0; + var ll = l ? l - parseInt(step * (l/count),10) : 0; + var bb = b < h ? b + parseInt(step * ((h-b)/count || 1),10) : h; + var rr = r < w ? r + parseInt(step * ((w-r)/count || 1),10) : w; + $next.css({ clip: 'rect('+tt+'px '+rr+'px '+bb+'px '+ll+'px)' }); + (step++ <= count) ? setTimeout(f, 13) : $curr.css('display', 'none'); + })(); + }); + $.extend(opts.cssBefore, { display: 'block', opacity: 1, top: 0, left: 0 }); + opts.animIn = { left: 0 }; + opts.animOut = { left: 0 }; +}; + +})(jQuery); diff --git a/web/libraries/jquery.hoverIntent/jquery.hoverIntent.js.2 b/web/libraries/jquery.hoverIntent/jquery.hoverIntent.js.2 new file mode 100644 index 0000000000000000000000000000000000000000..311aa86a3bb1476249fedb68dfbca3ae24bc18be --- /dev/null +++ b/web/libraries/jquery.hoverIntent/jquery.hoverIntent.js.2 @@ -0,0 +1,169 @@ +/*! + * hoverIntent v1.10.1 // 2019.10.05 // jQuery v1.7.0+ + * http://briancherne.github.io/jquery-hoverIntent/ + * + * You may use hoverIntent under the terms of the MIT license. Basically that + * means you are free to use hoverIntent as long as this header is left intact. + * Copyright 2007-2019 Brian Cherne + */ + +/** + * hoverIntent is similar to jQuery's built-in "hover" method except that + * instead of firing the handlerIn function immediately, hoverIntent checks + * to see if the user's mouse has slowed down (beneath the sensitivity + * threshold) before firing the event. The handlerOut function is only + * called after a matching handlerIn. + * + * // basic usage ... just like .hover() + * .hoverIntent( handlerIn, handlerOut ) + * .hoverIntent( handlerInOut ) + * + * // basic usage ... with event delegation! + * .hoverIntent( handlerIn, handlerOut, selector ) + * .hoverIntent( handlerInOut, selector ) + * + * // using a basic configuration object + * .hoverIntent( config ) + * + * @param handlerIn function OR configuration object + * @param handlerOut function OR selector for delegation OR undefined + * @param selector selector OR undefined + * @author Brian Cherne <brian(at)cherne(dot)net> + */ + +;(function(factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + define(['jquery'], factory); + } else if (typeof module === 'object' && module.exports) { + module.exports = factory(require('jquery')); + } else if (jQuery && !jQuery.fn.hoverIntent) { + factory(jQuery); + } +})(function($) { + 'use strict'; + + // default configuration values + var _cfg = { + interval: 100, + sensitivity: 6, + timeout: 0 + }; + + // counter used to generate an ID for each instance + var INSTANCE_COUNT = 0; + + // current X and Y position of mouse, updated during mousemove tracking (shared across instances) + var cX, cY; + + // saves the current pointer position coordinates based on the given mousemove event + var track = function(ev) { + cX = ev.pageX; + cY = ev.pageY; + }; + + // compares current and previous mouse positions + var compare = function(ev,$el,s,cfg) { + // compare mouse positions to see if pointer has slowed enough to trigger `over` function + if ( Math.sqrt( (s.pX-cX)*(s.pX-cX) + (s.pY-cY)*(s.pY-cY) ) < cfg.sensitivity ) { + $el.off(s.event,track); + delete s.timeoutId; + // set hoverIntent state as active for this element (permits `out` handler to trigger) + s.isActive = true; + // overwrite old mouseenter event coordinates with most recent pointer position + ev.pageX = cX; ev.pageY = cY; + // clear coordinate data from state object + delete s.pX; delete s.pY; + return cfg.over.apply($el[0],[ev]); + } else { + // set previous coordinates for next comparison + s.pX = cX; s.pY = cY; + // use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs) + s.timeoutId = setTimeout( function(){compare(ev, $el, s, cfg);} , cfg.interval ); + } + }; + + // triggers given `out` function at configured `timeout` after a mouseleave and clears state + var delay = function(ev,$el,s,out) { + var data = $el.data('hoverIntent'); + if (data) { + delete data[s.id]; + } + return out.apply($el[0],[ev]); + }; + + // checks if `value` is a function + var isFunction = function (value) { + return typeof value === 'function'; + }; + + $.fn.hoverIntent = function(handlerIn,handlerOut,selector) { + // instance ID, used as a key to store and retrieve state information on an element + var instanceId = INSTANCE_COUNT++; + + // extend the default configuration and parse parameters + var cfg = $.extend({}, _cfg); + if ( $.isPlainObject(handlerIn) ) { + cfg = $.extend(cfg, handlerIn); + if ( !isFunction(cfg.out) ) { + cfg.out = cfg.over; + } + } else if ( isFunction(handlerOut) ) { + cfg = $.extend(cfg, { over: handlerIn, out: handlerOut, selector: selector } ); + } else { + cfg = $.extend(cfg, { over: handlerIn, out: handlerIn, selector: handlerOut } ); + } + + // A private function for handling mouse 'hovering' + var handleHover = function(e) { + // cloned event to pass to handlers (copy required for event object to be passed in IE) + var ev = $.extend({},e); + + // the current target of the mouse event, wrapped in a jQuery object + var $el = $(this); + + // read hoverIntent data from element (or initialize if not present) + var hoverIntentData = $el.data('hoverIntent'); + if (!hoverIntentData) { $el.data('hoverIntent', (hoverIntentData = {})); } + + // read per-instance state from element (or initialize if not present) + var state = hoverIntentData[instanceId]; + if (!state) { hoverIntentData[instanceId] = state = { id: instanceId }; } + + // state properties: + // id = instance ID, used to clean up data + // timeoutId = timeout ID, reused for tracking mouse position and delaying "out" handler + // isActive = plugin state, true after `over` is called just until `out` is called + // pX, pY = previously-measured pointer coordinates, updated at each polling interval + // event = string representing the namespaced event used for mouse tracking + + // clear any existing timeout + if (state.timeoutId) { state.timeoutId = clearTimeout(state.timeoutId); } + + // namespaced event used to register and unregister mousemove tracking + var mousemove = state.event = 'mousemove.hoverIntent.hoverIntent'+instanceId; + + // handle the event, based on its type + if (e.type === 'mouseenter') { + // do nothing if already active + if (state.isActive) { return; } + // set "previous" X and Y position based on initial entry point + state.pX = ev.pageX; state.pY = ev.pageY; + // update "current" X and Y position based on mousemove + $el.off(mousemove,track).on(mousemove,track); + // start polling interval (self-calling timeout) to compare mouse coordinates over time + state.timeoutId = setTimeout( function(){compare(ev,$el,state,cfg);} , cfg.interval ); + } else { // "mouseleave" + // do nothing if not already active + if (!state.isActive) { return; } + // unbind expensive mousemove event + $el.off(mousemove,track); + // if hoverIntent state is true, then call the mouseOut function after the specified delay + state.timeoutId = setTimeout( function(){delay(ev,$el,state,cfg.out);} , cfg.timeout ); + } + }; + + // listen for mouseenter and mouseleave + return this.on({'mouseenter.hoverIntent':handleHover,'mouseleave.hoverIntent':handleHover}, cfg.selector); + }; +}); diff --git a/web/libraries/jquery.pause/jquery.pause.js.2 b/web/libraries/jquery.pause/jquery.pause.js.2 new file mode 100644 index 0000000000000000000000000000000000000000..1b5a09474c2309f7548de41ec42d91c9035a2d8c --- /dev/null +++ b/web/libraries/jquery.pause/jquery.pause.js.2 @@ -0,0 +1,94 @@ +/*! + * Pause jQuery plugin v0.1 + * + * Copyright 2010 by Tobia Conforto <tobia.conforto@gmail.com> + * + * Based on Pause-resume-animation jQuery plugin by Joe Weitzel + * + * 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. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +/* Changelog: + * + * 0.1 2010-06-13 Initial release + */ +(function() { + var $ = jQuery, + pauseId = 'jQuery.pause', + uuid = 1, + oldAnimate = $.fn.animate, + anims = {}; + + function now() { return new Date().getTime(); } + + $.fn.animate = function(prop, speed, easing, callback) { + var optall = $.speed(speed, easing, callback); + optall.complete = optall.old; // unwrap callback + return this.each(function() { + // check pauseId + if (! this[pauseId]) + this[pauseId] = uuid++; + // start animation + var opt = $.extend({}, optall); + oldAnimate.apply($(this), [prop, $.extend({}, opt)]); + // store data + anims[this[pauseId]] = { + run: true, + prop: prop, + opt: opt, + start: now(), + done: 0 + }; + }); + }; + + $.fn.pause = function() { + return this.each(function() { + // check pauseId + if (! this[pauseId]) + this[pauseId] = uuid++; + // fetch data + var data = anims[this[pauseId]]; + if (data && data.run) { + data.done += now() - data.start; + if (data.done > data.opt.duration) { + // remove stale entry + delete anims[this[pauseId]]; + } else { + // pause animation + $(this).stop(); + data.run = false; + } + } + }); + }; + + $.fn.resume = function() { + return this.each(function() { + // check pauseId + if (! this[pauseId]) + this[pauseId] = uuid++; + // fetch data + var data = anims[this[pauseId]]; + if (data && ! data.run) { + // resume animation + data.opt.duration -= data.done; + data.done = 0; + data.run = true; + data.start = now(); + oldAnimate.apply($(this), [data.prop, $.extend({}, data.opt)]); + } + }); + }; +})(); \ No newline at end of file diff --git a/web/libraries/json2/json2.js.2 b/web/libraries/json2/json2.js.2 new file mode 100644 index 0000000000000000000000000000000000000000..f6fada687570de82450767a59d605175c3e725c8 --- /dev/null +++ b/web/libraries/json2/json2.js.2 @@ -0,0 +1,530 @@ +// json2.js +// 2017-06-12 +// Public Domain. +// NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. + +// USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO +// NOT CONTROL. + +// This file creates a global JSON object containing two methods: stringify +// and parse. This file provides the ES5 JSON capability to ES3 systems. +// If a project might run on IE8 or earlier, then this file should be included. +// This file does nothing on ES5 systems. + +// JSON.stringify(value, replacer, space) +// value any JavaScript value, usually an object or array. +// replacer an optional parameter that determines how object +// values are stringified for objects. It can be a +// function or an array of strings. +// space an optional parameter that specifies the indentation +// of nested structures. If it is omitted, the text will +// be packed without extra whitespace. If it is a number, +// it will specify the number of spaces to indent at each +// level. If it is a string (such as "\t" or " "), +// it contains the characters used to indent at each level. +// This method produces a JSON text from a JavaScript value. +// When an object value is found, if the object contains a toJSON +// method, its toJSON method will be called and the result will be +// stringified. A toJSON method does not serialize: it returns the +// value represented by the name/value pair that should be serialized, +// or undefined if nothing should be serialized. The toJSON method +// will be passed the key associated with the value, and this will be +// bound to the value. + +// For example, this would serialize Dates as ISO strings. + +// Date.prototype.toJSON = function (key) { +// function f(n) { +// // Format integers to have at least two digits. +// return (n < 10) +// ? "0" + n +// : n; +// } +// return this.getUTCFullYear() + "-" + +// f(this.getUTCMonth() + 1) + "-" + +// f(this.getUTCDate()) + "T" + +// f(this.getUTCHours()) + ":" + +// f(this.getUTCMinutes()) + ":" + +// f(this.getUTCSeconds()) + "Z"; +// }; + +// You can provide an optional replacer method. It will be passed the +// key and value of each member, with this bound to the containing +// object. The value that is returned from your method will be +// serialized. If your method returns undefined, then the member will +// be excluded from the serialization. + +// If the replacer parameter is an array of strings, then it will be +// used to select the members to be serialized. It filters the results +// such that only members with keys listed in the replacer array are +// stringified. + +// Values that do not have JSON representations, such as undefined or +// functions, will not be serialized. Such values in objects will be +// dropped; in arrays they will be replaced with null. You can use +// a replacer function to replace those with JSON values. + +// JSON.stringify(undefined) returns undefined. + +// The optional space parameter produces a stringification of the +// value that is filled with line breaks and indentation to make it +// easier to read. + +// If the space parameter is a non-empty string, then that string will +// be used for indentation. If the space parameter is a number, then +// the indentation will be that many spaces. + +// Example: + +// text = JSON.stringify(["e", {pluribus: "unum"}]); +// // text is '["e",{"pluribus":"unum"}]' + +// text = JSON.stringify(["e", {pluribus: "unum"}], null, "\t"); +// // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]' + +// text = JSON.stringify([new Date()], function (key, value) { +// return this[key] instanceof Date +// ? "Date(" + this[key] + ")" +// : value; +// }); +// // text is '["Date(---current time---)"]' + +// JSON.parse(text, reviver) +// This method parses a JSON text to produce an object or array. +// It can throw a SyntaxError exception. + +// The optional reviver parameter is a function that can filter and +// transform the results. It receives each of the keys and values, +// and its return value is used instead of the original value. +// If it returns what it received, then the structure is not modified. +// If it returns undefined then the member is deleted. + +// Example: + +// // Parse the text. Values that look like ISO date strings will +// // be converted to Date objects. + +// myData = JSON.parse(text, function (key, value) { +// var a; +// if (typeof value === "string") { +// a = +// /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value); +// if (a) { +// return new Date(Date.UTC( +// +a[1], +a[2] - 1, +a[3], +a[4], +a[5], +a[6] +// )); +// } +// return value; +// } +// }); + +// myData = JSON.parse( +// "[\"Date(09/09/2001)\"]", +// function (key, value) { +// var d; +// if ( +// typeof value === "string" +// && value.slice(0, 5) === "Date(" +// && value.slice(-1) === ")" +// ) { +// d = new Date(value.slice(5, -1)); +// if (d) { +// return d; +// } +// } +// return value; +// } +// ); + +// This is a reference implementation. You are free to copy, modify, or +// redistribute. + +/*jslint + eval, for, this +*/ + +/*property + JSON, apply, call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours, + getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join, + lastIndex, length, parse, prototype, push, replace, slice, stringify, + test, toJSON, toString, valueOf +*/ + + +// Create a JSON object only if one does not already exist. We create the +// methods in a closure to avoid creating global variables. + +if (typeof JSON !== "object") { + JSON = {}; +} + +(function () { + "use strict"; + + var rx_one = /^[\],:{}\s]*$/; + var rx_two = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g; + var rx_three = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g; + var rx_four = /(?:^|:|,)(?:\s*\[)+/g; + var rx_escapable = /[\\"\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g; + var rx_dangerous = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g; + + function f(n) { + // Format integers to have at least two digits. + return (n < 10) + ? "0" + n + : n; + } + + function this_value() { + return this.valueOf(); + } + + if (typeof Date.prototype.toJSON !== "function") { + + Date.prototype.toJSON = function () { + + return isFinite(this.valueOf()) + ? ( + this.getUTCFullYear() + + "-" + + f(this.getUTCMonth() + 1) + + "-" + + f(this.getUTCDate()) + + "T" + + f(this.getUTCHours()) + + ":" + + f(this.getUTCMinutes()) + + ":" + + f(this.getUTCSeconds()) + + "Z" + ) + : null; + }; + + Boolean.prototype.toJSON = this_value; + Number.prototype.toJSON = this_value; + String.prototype.toJSON = this_value; + } + + var gap; + var indent; + var meta; + var rep; + + + function quote(string) { + +// If the string contains no control characters, no quote characters, and no +// backslash characters, then we can safely slap some quotes around it. +// Otherwise we must also replace the offending characters with safe escape +// sequences. + + rx_escapable.lastIndex = 0; + return rx_escapable.test(string) + ? "\"" + string.replace(rx_escapable, function (a) { + var c = meta[a]; + return typeof c === "string" + ? c + : "\\u" + ("0000" + a.charCodeAt(0).toString(16)).slice(-4); + }) + "\"" + : "\"" + string + "\""; + } + + + function str(key, holder) { + +// Produce a string from holder[key]. + + var i; // The loop counter. + var k; // The member key. + var v; // The member value. + var length; + var mind = gap; + var partial; + var value = holder[key]; + +// If the value has a toJSON method, call it to obtain a replacement value. + + if ( + value + && typeof value === "object" + && typeof value.toJSON === "function" + ) { + value = value.toJSON(key); + } + +// If we were called with a replacer function, then call the replacer to +// obtain a replacement value. + + if (typeof rep === "function") { + value = rep.call(holder, key, value); + } + +// What happens next depends on the value's type. + + switch (typeof value) { + case "string": + return quote(value); + + case "number": + +// JSON numbers must be finite. Encode non-finite numbers as null. + + return (isFinite(value)) + ? String(value) + : "null"; + + case "boolean": + case "null": + +// If the value is a boolean or null, convert it to a string. Note: +// typeof null does not produce "null". The case is included here in +// the remote chance that this gets fixed someday. + + return String(value); + +// If the type is "object", we might be dealing with an object or an array or +// null. + + case "object": + +// Due to a specification blunder in ECMAScript, typeof null is "object", +// so watch out for that case. + + if (!value) { + return "null"; + } + +// Make an array to hold the partial results of stringifying this object value. + + gap += indent; + partial = []; + +// Is the value an array? + + if (Object.prototype.toString.apply(value) === "[object Array]") { + +// The value is an array. Stringify every element. Use null as a placeholder +// for non-JSON values. + + length = value.length; + for (i = 0; i < length; i += 1) { + partial[i] = str(i, value) || "null"; + } + +// Join all of the elements together, separated with commas, and wrap them in +// brackets. + + v = partial.length === 0 + ? "[]" + : gap + ? ( + "[\n" + + gap + + partial.join(",\n" + gap) + + "\n" + + mind + + "]" + ) + : "[" + partial.join(",") + "]"; + gap = mind; + return v; + } + +// If the replacer is an array, use it to select the members to be stringified. + + if (rep && typeof rep === "object") { + length = rep.length; + for (i = 0; i < length; i += 1) { + if (typeof rep[i] === "string") { + k = rep[i]; + v = str(k, value); + if (v) { + partial.push(quote(k) + ( + (gap) + ? ": " + : ":" + ) + v); + } + } + } + } else { + +// Otherwise, iterate through all of the keys in the object. + + for (k in value) { + if (Object.prototype.hasOwnProperty.call(value, k)) { + v = str(k, value); + if (v) { + partial.push(quote(k) + ( + (gap) + ? ": " + : ":" + ) + v); + } + } + } + } + +// Join all of the member texts together, separated with commas, +// and wrap them in braces. + + v = partial.length === 0 + ? "{}" + : gap + ? "{\n" + gap + partial.join(",\n" + gap) + "\n" + mind + "}" + : "{" + partial.join(",") + "}"; + gap = mind; + return v; + } + } + +// If the JSON object does not yet have a stringify method, give it one. + + if (typeof JSON.stringify !== "function") { + meta = { // table of character substitutions + "\b": "\\b", + "\t": "\\t", + "\n": "\\n", + "\f": "\\f", + "\r": "\\r", + "\"": "\\\"", + "\\": "\\\\" + }; + JSON.stringify = function (value, replacer, space) { + +// The stringify method takes a value and an optional replacer, and an optional +// space parameter, and returns a JSON text. The replacer can be a function +// that can replace values, or an array of strings that will select the keys. +// A default replacer method can be provided. Use of the space parameter can +// produce text that is more easily readable. + + var i; + gap = ""; + indent = ""; + +// If the space parameter is a number, make an indent string containing that +// many spaces. + + if (typeof space === "number") { + for (i = 0; i < space; i += 1) { + indent += " "; + } + +// If the space parameter is a string, it will be used as the indent string. + + } else if (typeof space === "string") { + indent = space; + } + +// If there is a replacer, it must be a function or an array. +// Otherwise, throw an error. + + rep = replacer; + if (replacer && typeof replacer !== "function" && ( + typeof replacer !== "object" + || typeof replacer.length !== "number" + )) { + throw new Error("JSON.stringify"); + } + +// Make a fake root object containing our value under the key of "". +// Return the result of stringifying the value. + + return str("", {"": value}); + }; + } + + +// If the JSON object does not yet have a parse method, give it one. + + if (typeof JSON.parse !== "function") { + JSON.parse = function (text, reviver) { + +// The parse method takes a text and an optional reviver function, and returns +// a JavaScript value if the text is a valid JSON text. + + var j; + + function walk(holder, key) { + +// The walk method is used to recursively walk the resulting structure so +// that modifications can be made. + + var k; + var v; + var value = holder[key]; + if (value && typeof value === "object") { + for (k in value) { + if (Object.prototype.hasOwnProperty.call(value, k)) { + v = walk(value, k); + if (v !== undefined) { + value[k] = v; + } else { + delete value[k]; + } + } + } + } + return reviver.call(holder, key, value); + } + + +// Parsing happens in four stages. In the first stage, we replace certain +// Unicode characters with escape sequences. JavaScript handles many characters +// incorrectly, either silently deleting them, or treating them as line endings. + + text = String(text); + rx_dangerous.lastIndex = 0; + if (rx_dangerous.test(text)) { + text = text.replace(rx_dangerous, function (a) { + return ( + "\\u" + + ("0000" + a.charCodeAt(0).toString(16)).slice(-4) + ); + }); + } + +// In the second stage, we run the text against regular expressions that look +// for non-JSON patterns. We are especially concerned with "()" and "new" +// because they can cause invocation, and "=" because it can cause mutation. +// But just to be safe, we want to reject all unexpected forms. + +// We split the second stage into 4 regexp operations in order to work around +// crippling inefficiencies in IE's and Safari's regexp engines. First we +// replace the JSON backslash pairs with "@" (a non-JSON character). Second, we +// replace all simple value tokens with "]" characters. Third, we delete all +// open brackets that follow a colon or comma or that begin the text. Finally, +// we look to see that the remaining characters are only whitespace or "]" or +// "," or ":" or "{" or "}". If that is so, then the text is safe for eval. + + if ( + rx_one.test( + text + .replace(rx_two, "@") + .replace(rx_three, "]") + .replace(rx_four, "") + ) + ) { + +// In the third stage we use the eval function to compile the text into a +// JavaScript structure. The "{" operator is subject to a syntactic ambiguity +// in JavaScript: it can begin a block or an object literal. We wrap the text +// in parens to eliminate the ambiguity. + + j = eval("(" + text + ")"); + +// In the optional fourth stage, we recursively walk the new structure, passing +// each name/value pair to a reviver function for possible transformation. + + return (typeof reviver === "function") + ? walk({"": j}, "") + : j; + } + +// If the text is not JSON parseable, then a SyntaxError is thrown. + + throw new SyntaxError("JSON.parse"); + }; + } +}());