diff --git a/codebase/composer.json b/codebase/composer.json index c67a70e3c..8cddf7b5c 100644 --- a/codebase/composer.json +++ b/codebase/composer.json @@ -82,6 +82,31 @@ "reference": "master" } } + }, + { + "type": "package", + "package": { + "name": "masonry/masonry", + "version": "4.2.2", + "type": "drupal-library", + "source": { + "url": "https://github.com/desandro/masonry.git", + "type": "git", + "reference": "3b0883cf4a4a046896719b9cf282ea74be7ffecd" + } + } + }, + { + "type": "package", + "package": { + "name": "imagesloaded/imagesloaded", + "version": "4.1.4", + "type": "drupal-library", + "dist": { + "url": "https://unpkg.com/imagesloaded@5/imagesloaded.pkgd.min.js", + "type": "file" + } + } } ], "require": { @@ -127,7 +152,8 @@ "drupal/workbench": "^1.3", "drupal/workbench_access": "^1.0@beta", "drush/drush": "^10.0", - "islandora-rdm/islandora_fits": "dev-master", + "imagesloaded/imagesloaded": "^4.1", + "islandora-rdm/islandora_fits": "dev-8.x-1.x", "islandora/carapace": "dev-8.x-3.x", "jhu-idc/idc-ui-theme": "dev-main", "jhu-idc/idc_defaults": "dev-main", @@ -138,6 +164,7 @@ "jhu-idc/migrate_file": "dev-8.x-1.x", "jhu_idc/idc_migration": "^2.0", "maennchen/zipstream-php": "^2.1", + "masonry/masonry": "^4.2", "seboettg/citeproc-php": "v2.2.5", "symfony/string": "^5.4", "vlucas/phpdotenv": "^4.0", diff --git a/codebase/composer.lock b/codebase/composer.lock index 80a794fb9..3dc41a042 100644 --- a/codebase/composer.lock +++ b/codebase/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": "0147b9e2baeb89143b0828fef196e12c", + "content-hash": "86df763eeb949255bf4768b153298a62", "packages": [ { "name": "alchemy/zippy", @@ -7706,23 +7706,33 @@ }, "time": "2021-04-26T09:17:50+00:00" }, + { + "name": "imagesloaded/imagesloaded", + "version": "4.1.4", + "dist": { + "type": "file", + "url": "https://unpkg.com/imagesloaded@5/imagesloaded.pkgd.min.js" + }, + "type": "drupal-library" + }, { "name": "islandora-rdm/islandora_fits", - "version": "dev-master", + "version": "dev-8.x-1.x", "source": { "type": "git", "url": "https://github.com/roblib/islandora_fits.git", - "reference": "b9d041590fd31cc2e4a5d2675e8956ada9101e97" + "reference": "586427738cd9e2724d1ee3aeff8b42d114b518a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/roblib/islandora_fits/zipball/b9d041590fd31cc2e4a5d2675e8956ada9101e97", - "reference": "b9d041590fd31cc2e4a5d2675e8956ada9101e97", + "url": "https://api.github.com/repos/roblib/islandora_fits/zipball/586427738cd9e2724d1ee3aeff8b42d114b518a6", + "reference": "586427738cd9e2724d1ee3aeff8b42d114b518a6", "shasum": "" }, "require": { "ext-simplexml": "*" }, + "default-branch": true, "type": "drupal-module", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -7737,7 +7747,7 @@ "issues": "https://www.drupal.org/project/issues/islandora_fits", "source": "http://cgit.drupalcode.org/islandora_fits" }, - "time": "2021-01-14T17:09:48+00:00" + "time": "2021-01-14T23:01:15+00:00" }, { "name": "islandora/carapace", @@ -8153,12 +8163,12 @@ "source": { "type": "git", "url": "https://github.com/jhu-idc/idc-ui-theme.git", - "reference": "855a291454c71374d12bb72e2439bd27f44f2795" + "reference": "32f8f1dcdf011a7eab4d932602829cdf92fa8264" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jhu-idc/idc-ui-theme/zipball/855a291454c71374d12bb72e2439bd27f44f2795", - "reference": "855a291454c71374d12bb72e2439bd27f44f2795", + "url": "https://api.github.com/repos/jhu-idc/idc-ui-theme/zipball/32f8f1dcdf011a7eab4d932602829cdf92fa8264", + "reference": "32f8f1dcdf011a7eab4d932602829cdf92fa8264", "shasum": "" }, "default-branch": true, @@ -8168,7 +8178,7 @@ "source": "https://github.com/jhu-idc/idc-ui-theme/tree/main", "issues": "https://github.com/jhu-idc/idc-ui-theme/issues" }, - "time": "2022-04-26T19:21:26+00:00" + "time": "2022-05-19T20:34:43+00:00" }, { "name": "jhu-idc/idc_defaults", @@ -8238,12 +8248,12 @@ "source": { "type": "git", "url": "https://github.com/jhu-idc/idc_ui_module.git", - "reference": "90a7615b419ee9526a34979a682eb09a123fe99b" + "reference": "5b7ff6c8de994d8243a226724e302cce20c448c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jhu-idc/idc_ui_module/zipball/90a7615b419ee9526a34979a682eb09a123fe99b", - "reference": "90a7615b419ee9526a34979a682eb09a123fe99b", + "url": "https://api.github.com/repos/jhu-idc/idc_ui_module/zipball/5b7ff6c8de994d8243a226724e302cce20c448c7", + "reference": "5b7ff6c8de994d8243a226724e302cce20c448c7", "shasum": "" }, "default-branch": true, @@ -8253,7 +8263,7 @@ "source": "https://github.com/jhu-idc/idc_ui_module/tree/main", "issues": "https://github.com/jhu-idc/idc_ui_module/issues" }, - "time": "2022-03-23T19:05:41+00:00" + "time": "2022-06-10T21:24:51+00:00" }, { "name": "jhu-idc/islandora_defaults", @@ -8261,12 +8271,12 @@ "source": { "type": "git", "url": "https://github.com/jhu-idc/islandora_defaults.git", - "reference": "6ba00e560d13f1f5876c5b8a07c878abb91a6133" + "reference": "b776cc40df7844b3c7f7559181fc0ba21ebced4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jhu-idc/islandora_defaults/zipball/6ba00e560d13f1f5876c5b8a07c878abb91a6133", - "reference": "6ba00e560d13f1f5876c5b8a07c878abb91a6133", + "url": "https://api.github.com/repos/jhu-idc/islandora_defaults/zipball/b776cc40df7844b3c7f7559181fc0ba21ebced4e", + "reference": "b776cc40df7844b3c7f7559181fc0ba21ebced4e", "shasum": "" }, "require": { @@ -8293,7 +8303,7 @@ "issues": "https://github.com/jhu-idc/islandora_defaults/issues", "source": "https://github.com/jhu-idc/islandora_defaults/tree/8.x-1.x" }, - "time": "2021-10-04T20:02:31+00:00" + "time": "2022-05-24T20:31:56+00:00" }, { "name": "jhu-idc/islandora_repository_reports", @@ -8369,12 +8379,12 @@ "source": { "type": "git", "url": "https://github.com/jhu-idc/reference_value_pair.git", - "reference": "ee0bb998be76fc9b32884028d417fd7779df235d" + "reference": "7cecf2ce4642c4d0f5f87d7525598756cfc82308" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jhu-idc/reference_value_pair/zipball/ee0bb998be76fc9b32884028d417fd7779df235d", - "reference": "ee0bb998be76fc9b32884028d417fd7779df235d", + "url": "https://api.github.com/repos/jhu-idc/reference_value_pair/zipball/7cecf2ce4642c4d0f5f87d7525598756cfc82308", + "reference": "7cecf2ce4642c4d0f5f87d7525598756cfc82308", "shasum": "" }, "default-branch": true, @@ -8391,7 +8401,7 @@ "issues": "http://github.com/jhu-idc/reference_value_pair", "source": "http://github.com/jhu-idc/reference_value_pair" }, - "time": "2021-08-27T15:49:40+00:00" + "time": "2022-05-31T14:43:55+00:00" }, { "name": "jhu_idc/idc_migration", @@ -9294,6 +9304,16 @@ ], "time": "2020-05-30T13:11:16+00:00" }, + { + "name": "masonry/masonry", + "version": "4.2.2", + "source": { + "type": "git", + "url": "https://github.com/desandro/masonry.git", + "reference": "3b0883cf4a4a046896719b9cf282ea74be7ffecd" + }, + "type": "drupal-library" + }, { "name": "masterminds/html5", "version": "2.7.4", @@ -21664,5 +21684,5 @@ "php": ">=7.0.8" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/codebase/web/libraries/imagesloaded/imagesloaded.pkgd.min.js b/codebase/web/libraries/imagesloaded/imagesloaded.pkgd.min.js new file mode 100644 index 000000000..b55bea29f --- /dev/null +++ b/codebase/web/libraries/imagesloaded/imagesloaded.pkgd.min.js @@ -0,0 +1,12 @@ +/*! + * imagesLoaded PACKAGED v5.0.0 + * JavaScript is all like "You images are done yet or what?" + * MIT License + */ +!function(t,e){"object"==typeof module&&module.exports?module.exports=e():t.EvEmitter=e()}("undefined"!=typeof window?window:this,(function(){function t(){}let e=t.prototype;return e.on=function(t,e){if(!t||!e)return this;let i=this._events=this._events||{},s=i[t]=i[t]||[];return s.includes(e)||s.push(e),this},e.once=function(t,e){if(!t||!e)return this;this.on(t,e);let i=this._onceEvents=this._onceEvents||{};return(i[t]=i[t]||{})[e]=!0,this},e.off=function(t,e){let i=this._events&&this._events[t];if(!i||!i.length)return this;let s=i.indexOf(e);return-1!=s&&i.splice(s,1),this},e.emitEvent=function(t,e){let i=this._events&&this._events[t];if(!i||!i.length)return this;i=i.slice(0),e=e||[];let s=this._onceEvents&&this._onceEvents[t];for(let n of i){s&&s[n]&&(this.off(t,n),delete s[n]),n.apply(this,e)}return this},e.allOff=function(){return delete this._events,delete this._onceEvents,this},t})), +/*! + * imagesLoaded v5.0.0 + * JavaScript is all like "You images are done yet or what?" + * MIT License + */ +function(t,e){"object"==typeof module&&module.exports?module.exports=e(t,require("ev-emitter")):t.imagesLoaded=e(t,t.EvEmitter)}("undefined"!=typeof window?window:this,(function(t,e){let i=t.jQuery,s=t.console;function n(t,e,o){if(!(this instanceof n))return new n(t,e,o);let r=t;var h;("string"==typeof t&&(r=document.querySelectorAll(t)),r)?(this.elements=(h=r,Array.isArray(h)?h:"object"==typeof h&&"number"==typeof h.length?[...h]:[h]),this.options={},"function"==typeof e?o=e:Object.assign(this.options,e),o&&this.on("always",o),this.getImages(),i&&(this.jqDeferred=new i.Deferred),setTimeout(this.check.bind(this))):s.error(`Bad element for imagesLoaded ${r||t}`)}n.prototype=Object.create(e.prototype),n.prototype.getImages=function(){this.images=[],this.elements.forEach(this.addElementImages,this)};const o=[1,9,11];n.prototype.addElementImages=function(t){"IMG"===t.nodeName&&this.addImage(t),!0===this.options.background&&this.addElementBackgroundImages(t);let{nodeType:e}=t;if(!e||!o.includes(e))return;let i=t.querySelectorAll("img");for(let t of i)this.addImage(t);if("string"==typeof this.options.background){let e=t.querySelectorAll(this.options.background);for(let t of e)this.addElementBackgroundImages(t)}};const r=/url\((['"])?(.*?)\1\)/gi;function h(t){this.img=t}function d(t,e){this.url=t,this.element=e,this.img=new Image}return n.prototype.addElementBackgroundImages=function(t){let e=getComputedStyle(t);if(!e)return;let i=r.exec(e.backgroundImage);for(;null!==i;){let s=i&&i[2];s&&this.addBackground(s,t),i=r.exec(e.backgroundImage)}},n.prototype.addImage=function(t){let e=new h(t);this.images.push(e)},n.prototype.addBackground=function(t,e){let i=new d(t,e);this.images.push(i)},n.prototype.check=function(){if(this.progressedCount=0,this.hasAnyBroken=!1,!this.images.length)return void this.complete();let t=(t,e,i)=>{setTimeout((()=>{this.progress(t,e,i)}))};this.images.forEach((function(e){e.once("progress",t),e.check()}))},n.prototype.progress=function(t,e,i){this.progressedCount++,this.hasAnyBroken=this.hasAnyBroken||!t.isLoaded,this.emitEvent("progress",[this,t,e]),this.jqDeferred&&this.jqDeferred.notify&&this.jqDeferred.notify(this,t),this.progressedCount===this.images.length&&this.complete(),this.options.debug&&s&&s.log(`progress: ${i}`,t,e)},n.prototype.complete=function(){let t=this.hasAnyBroken?"fail":"done";if(this.isComplete=!0,this.emitEvent(t,[this]),this.emitEvent("always",[this]),this.jqDeferred){let t=this.hasAnyBroken?"reject":"resolve";this.jqDeferred[t](this)}},h.prototype=Object.create(e.prototype),h.prototype.check=function(){this.getIsImageComplete()?this.confirm(0!==this.img.naturalWidth,"naturalWidth"):(this.proxyImage=new Image,this.img.crossOrigin&&(this.proxyImage.crossOrigin=this.img.crossOrigin),this.proxyImage.addEventListener("load",this),this.proxyImage.addEventListener("error",this),this.img.addEventListener("load",this),this.img.addEventListener("error",this),this.proxyImage.src=this.img.currentSrc||this.img.src)},h.prototype.getIsImageComplete=function(){return this.img.complete&&this.img.naturalWidth},h.prototype.confirm=function(t,e){this.isLoaded=t;let{parentNode:i}=this.img,s="PICTURE"===i.nodeName?i:this.img;this.emitEvent("progress",[this,s,e])},h.prototype.handleEvent=function(t){let e="on"+t.type;this[e]&&this[e](t)},h.prototype.onload=function(){this.confirm(!0,"onload"),this.unbindEvents()},h.prototype.onerror=function(){this.confirm(!1,"onerror"),this.unbindEvents()},h.prototype.unbindEvents=function(){this.proxyImage.removeEventListener("load",this),this.proxyImage.removeEventListener("error",this),this.img.removeEventListener("load",this),this.img.removeEventListener("error",this)},d.prototype=Object.create(h.prototype),d.prototype.check=function(){this.img.addEventListener("load",this),this.img.addEventListener("error",this),this.img.src=this.url,this.getIsImageComplete()&&(this.confirm(0!==this.img.naturalWidth,"naturalWidth"),this.unbindEvents())},d.prototype.unbindEvents=function(){this.img.removeEventListener("load",this),this.img.removeEventListener("error",this)},d.prototype.confirm=function(t,e){this.isLoaded=t,this.emitEvent("progress",[this,this.element,e])},n.makeJQueryPlugin=function(e){(e=e||t.jQuery)&&(i=e,i.fn.imagesLoaded=function(t,e){return new n(this,t,e).jqDeferred.promise(i(this))})},n.makeJQueryPlugin(),n})); \ No newline at end of file diff --git a/codebase/web/libraries/masonry b/codebase/web/libraries/masonry new file mode 160000 index 000000000..3b0883cf4 --- /dev/null +++ b/codebase/web/libraries/masonry @@ -0,0 +1 @@ +Subproject commit 3b0883cf4a4a046896719b9cf282ea74be7ffecd