From 61238d5e2385203cf09037512936f1ad404e6549 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 16 Jan 2018 23:58:14 -0500 Subject: [PATCH 1/7] Add jquery and jquery-colorbox to Composer - Fix selector syntax issue with newer version of JQuery --- composer.json | 4 +- composer.lock | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++ js/main.js | 2 +- 3 files changed, 123 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c48a44a5e7..deef01bae3 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,9 @@ "smarty/smarty": "^3.1", "michelf/php-markdown": "^1.7", "fxp/composer-asset-plugin": "~1.3", - "bower-asset/base64": "^1.0" + "bower-asset/base64": "^1.0", + "npm-asset/jquery": "^2.2", + "npm-asset/jquery-colorbox": "^1.6" }, "repositories": [ { diff --git a/composer.lock b/composer.lock index a2aefe5678..aafbf6d2bc 100644 --- a/composer.lock +++ b/composer.lock @@ -5,6 +5,7 @@ "This file is @generated automatically" ], "content-hash": "fcf1ea05c07796ccf5ef2c437e6acffd", + "content-hash": "eff7188edca155144e5ce162208634df", "packages": [ { "name": "bower-asset/base64", @@ -347,6 +348,124 @@ ], "time": "2017-12-18T10:38:51+00:00" }, + { + "name": "npm-asset/jquery", + "version": "2.2.4", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", + "reference": null, + "shasum": "2c89d6889b5eac522a7eea32c14521559c6cbf02" + }, + "require-dev": { + "npm-asset/commitplease": "2.0.0", + "npm-asset/core-js": "0.9.17", + "npm-asset/grunt": "0.4.5", + "npm-asset/grunt-babel": "5.0.1", + "npm-asset/grunt-cli": "0.1.13", + "npm-asset/grunt-compare-size": "0.4.0", + "npm-asset/grunt-contrib-jshint": "0.11.2", + "npm-asset/grunt-contrib-uglify": "0.9.2", + "npm-asset/grunt-contrib-watch": "0.6.1", + "npm-asset/grunt-git-authors": "2.0.1", + "npm-asset/grunt-jscs": "2.1.0", + "npm-asset/grunt-jsonlint": "1.0.4", + "npm-asset/grunt-npmcopy": "0.1.0", + "npm-asset/gzip-js": "0.3.2", + "npm-asset/jsdom": "5.6.1", + "npm-asset/load-grunt-tasks": "1.0.0", + "npm-asset/qunit-assert-step": "1.0.3", + "npm-asset/qunitjs": "1.17.1", + "npm-asset/requirejs": "2.1.17", + "npm-asset/sinon": "1.10.3", + "npm-asset/sizzle": "2.2.1", + "npm-asset/strip-json-comments": "1.0.3", + "npm-asset/testswarm": "1.1.0", + "npm-asset/win-spawn": "2.0.0" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-bugs": { + "url": "https://github.com/jquery/jquery/issues" + }, + "npm-asset-main": "dist/jquery.js", + "npm-asset-directories": [], + "npm-asset-repository": { + "type": "git", + "url": "git+https://github.com/jquery/jquery.git" + }, + "npm-asset-scripts": { + "build": "npm install && grunt", + "start": "grunt watch", + "test": "grunt && grunt test" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "jQuery Foundation and other contributors", + "url": "https://github.com/jquery/jquery/blob/2.2.4/AUTHORS.txt" + } + ], + "description": "JavaScript library for DOM operations", + "homepage": "http://jquery.com", + "keywords": [ + "browser", + "javascript", + "jquery", + "library" + ], + "time": "2016-05-20T17:26:07+00:00" + }, + { + "name": "npm-asset/jquery-colorbox", + "version": "1.6.4", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/jquery-colorbox/-/jquery-colorbox-1.6.4.tgz", + "reference": null, + "shasum": "799452523a6c494839224ef702e807deb9c06cc5" + }, + "require": { + "npm-asset/jquery": ">=1.3.2" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-bugs": { + "url": "https://github.com/jackmoore/colorbox/issues" + }, + "npm-asset-main": "jquery.colorbox.js", + "npm-asset-directories": [], + "npm-asset-repository": { + "type": "git", + "url": "git+ssh://git@github.com/jackmoore/colorbox.git" + }, + "npm-asset-scripts": [] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jack Moore", + "email": "hello@jacklmoore.com", + "url": "http://www.jacklmoore.com" + } + ], + "description": "jQuery lightbox and modal window plugin.", + "homepage": "http://www.jacklmoore.com/colorbox", + "keywords": [ + "gallery", + "jquery-plugin", + "lightbox", + "modal", + "popup", + "ui" + ], + "time": "2016-05-10T22:22:39+00:00" + }, { "name": "paragonie/random_compat", "version": "v2.0.11", diff --git a/js/main.js b/js/main.js index fff4078ae8..2feb2db727 100644 --- a/js/main.js +++ b/js/main.js @@ -133,7 +133,7 @@ last_popup_button = null; } } - $('a[rel^=#]').click(function(e){ + $('a[rel^="#"]').click(function(e){ e.preventDefault(); var parent = $(this).parent(); var isSelected = (last_popup_button && parent.attr('id') == last_popup_button.attr('id')); From 9ee1b14b2b0bc69d2f6231a18052578b53fff8f0 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 17 Jan 2018 00:01:34 -0500 Subject: [PATCH 2/7] Update references to colorbox css and js files - Remove commented out references to other css/js files --- view/templates/head.tpl | 5 ++--- view/theme/frio/templates/head.tpl | 7 +++---- view/theme/frost/templates/end.tpl | 3 +-- view/theme/frost/templates/head.tpl | 3 +-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/view/templates/head.tpl b/view/templates/head.tpl index c95f2cfa07..f4f7704cb2 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -3,7 +3,7 @@ - + @@ -35,12 +35,11 @@ - - + diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl index a1932b4730..de94b080f1 100644 --- a/view/theme/frio/templates/head.tpl +++ b/view/theme/frio/templates/head.tpl @@ -8,7 +8,7 @@ {{* All needed css files - Note: css must be inserted before js files *}} - + @@ -58,13 +58,12 @@ - - + - + diff --git a/view/theme/frost/templates/end.tpl b/view/theme/frost/templates/end.tpl index 305a132814..5b39848768 100644 --- a/view/theme/frost/templates/end.tpl +++ b/view/theme/frost/templates/end.tpl @@ -6,8 +6,7 @@ - -{{**}} + diff --git a/view/theme/frost/templates/head.tpl b/view/theme/frost/templates/head.tpl index 21144eb0c2..33fd95403c 100644 --- a/view/theme/frost/templates/head.tpl +++ b/view/theme/frost/templates/head.tpl @@ -2,8 +2,7 @@ - -{{**}} + From a948e063915c696947ac94c788878de270c86141 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 17 Jan 2018 00:01:55 -0500 Subject: [PATCH 3/7] Remove colorbox from library --- library/colorbox/README.md | 616 ------ library/colorbox/bower.json | 40 - library/colorbox/colorbox.ai | 1811 ----------------- library/colorbox/colorbox.css | 58 - library/colorbox/content/ajax.html | 11 - library/colorbox/content/daisy.jpg | Bin 101126 -> 0 bytes library/colorbox/content/daisy@2x.jpg | Bin 335898 -> 0 bytes library/colorbox/content/homer.jpg | Bin 8584 -> 0 bytes library/colorbox/content/marylou.jpg | Bin 52286 -> 0 bytes library/colorbox/content/ohoopee1.jpg | Bin 71685 -> 0 bytes library/colorbox/content/ohoopee2.jpg | Bin 111141 -> 0 bytes library/colorbox/content/ohoopee3.jpg | Bin 69240 -> 0 bytes library/colorbox/example1/colorbox.css | 70 - library/colorbox/example1/images/border.png | Bin 76 -> 0 bytes library/colorbox/example1/images/controls.png | Bin 1261 -> 0 bytes library/colorbox/example1/images/loading.gif | Bin 8685 -> 0 bytes .../example1/images/loading_background.png | Bin 131 -> 0 bytes library/colorbox/example1/images/overlay.png | Bin 115 -> 0 bytes library/colorbox/example1/index.html | 95 - library/colorbox/example2/colorbox.css | 50 - library/colorbox/example2/images/controls.png | Bin 503 -> 0 bytes library/colorbox/example2/images/loading.gif | Bin 6244 -> 0 bytes library/colorbox/example2/index.html | 95 - library/colorbox/example3/colorbox.css | 45 - library/colorbox/example3/images/controls.png | Bin 1633 -> 0 bytes library/colorbox/example3/images/loading.gif | Bin 6244 -> 0 bytes library/colorbox/example3/index.html | 95 - library/colorbox/example4/colorbox.css | 66 - library/colorbox/example4/images/border1.png | Bin 629 -> 0 bytes library/colorbox/example4/images/border2.png | Bin 112 -> 0 bytes library/colorbox/example4/images/loading.gif | Bin 6244 -> 0 bytes library/colorbox/example4/index.html | 95 - library/colorbox/example5/colorbox.css | 58 - library/colorbox/example5/images/border.png | Bin 139 -> 0 bytes library/colorbox/example5/images/controls.png | Bin 2027 -> 0 bytes library/colorbox/example5/images/loading.gif | Bin 8685 -> 0 bytes .../example5/images/loading_background.png | Bin 131 -> 0 bytes library/colorbox/example5/index.html | 95 - library/colorbox/i18n/jquery.colorbox-ar.js | 15 - library/colorbox/i18n/jquery.colorbox-bg.js | 16 - library/colorbox/i18n/jquery.colorbox-bn.js | 16 - library/colorbox/i18n/jquery.colorbox-ca.js | 13 - library/colorbox/i18n/jquery.colorbox-cs.js | 16 - library/colorbox/i18n/jquery.colorbox-da.js | 16 - library/colorbox/i18n/jquery.colorbox-de.js | 15 - library/colorbox/i18n/jquery.colorbox-es.js | 13 - library/colorbox/i18n/jquery.colorbox-et.js | 15 - library/colorbox/i18n/jquery.colorbox-fa.js | 18 - library/colorbox/i18n/jquery.colorbox-fi.js | 15 - library/colorbox/i18n/jquery.colorbox-fr.js | 15 - library/colorbox/i18n/jquery.colorbox-gl.js | 13 - library/colorbox/i18n/jquery.colorbox-gr.js | 16 - library/colorbox/i18n/jquery.colorbox-he.js | 16 - library/colorbox/i18n/jquery.colorbox-hr.js | 15 - library/colorbox/i18n/jquery.colorbox-hu.js | 15 - library/colorbox/i18n/jquery.colorbox-id.js | 15 - library/colorbox/i18n/jquery.colorbox-it.js | 15 - library/colorbox/i18n/jquery.colorbox-ja.js | 15 - library/colorbox/i18n/jquery.colorbox-kr.js | 15 - library/colorbox/i18n/jquery.colorbox-lt.js | 15 - library/colorbox/i18n/jquery.colorbox-lv.js | 16 - library/colorbox/i18n/jquery.colorbox-my.js | 15 - library/colorbox/i18n/jquery.colorbox-nl.js | 15 - library/colorbox/i18n/jquery.colorbox-no.js | 16 - library/colorbox/i18n/jquery.colorbox-pl.js | 16 - .../colorbox/i18n/jquery.colorbox-pt-BR.js | 15 - library/colorbox/i18n/jquery.colorbox-ro.js | 15 - library/colorbox/i18n/jquery.colorbox-ru.js | 16 - library/colorbox/i18n/jquery.colorbox-si.js | 15 - library/colorbox/i18n/jquery.colorbox-sk.js | 15 - library/colorbox/i18n/jquery.colorbox-sr.js | 15 - library/colorbox/i18n/jquery.colorbox-sv.js | 15 - library/colorbox/i18n/jquery.colorbox-tr.js | 19 - library/colorbox/i18n/jquery.colorbox-uk.js | 16 - .../colorbox/i18n/jquery.colorbox-zh-CN.js | 15 - .../colorbox/i18n/jquery.colorbox-zh-TW.js | 15 - library/colorbox/images/border.png | Bin 139 -> 0 bytes library/colorbox/images/controls.png | Bin 2027 -> 0 bytes library/colorbox/images/loading.gif | Bin 8685 -> 0 bytes .../colorbox/images/loading_background.png | Bin 131 -> 0 bytes library/colorbox/jquery.colorbox-min.js | 6 - library/colorbox/jquery.colorbox.js | 1105 ---------- library/colorbox/package.json | 29 - 83 files changed, 5022 deletions(-) delete mode 100644 library/colorbox/README.md delete mode 100644 library/colorbox/bower.json delete mode 100644 library/colorbox/colorbox.ai delete mode 100644 library/colorbox/colorbox.css delete mode 100644 library/colorbox/content/ajax.html delete mode 100644 library/colorbox/content/daisy.jpg delete mode 100644 library/colorbox/content/daisy@2x.jpg delete mode 100644 library/colorbox/content/homer.jpg delete mode 100644 library/colorbox/content/marylou.jpg delete mode 100644 library/colorbox/content/ohoopee1.jpg delete mode 100644 library/colorbox/content/ohoopee2.jpg delete mode 100644 library/colorbox/content/ohoopee3.jpg delete mode 100644 library/colorbox/example1/colorbox.css delete mode 100644 library/colorbox/example1/images/border.png delete mode 100644 library/colorbox/example1/images/controls.png delete mode 100644 library/colorbox/example1/images/loading.gif delete mode 100644 library/colorbox/example1/images/loading_background.png delete mode 100644 library/colorbox/example1/images/overlay.png delete mode 100644 library/colorbox/example1/index.html delete mode 100644 library/colorbox/example2/colorbox.css delete mode 100644 library/colorbox/example2/images/controls.png delete mode 100644 library/colorbox/example2/images/loading.gif delete mode 100644 library/colorbox/example2/index.html delete mode 100644 library/colorbox/example3/colorbox.css delete mode 100644 library/colorbox/example3/images/controls.png delete mode 100644 library/colorbox/example3/images/loading.gif delete mode 100644 library/colorbox/example3/index.html delete mode 100644 library/colorbox/example4/colorbox.css delete mode 100644 library/colorbox/example4/images/border1.png delete mode 100644 library/colorbox/example4/images/border2.png delete mode 100644 library/colorbox/example4/images/loading.gif delete mode 100644 library/colorbox/example4/index.html delete mode 100644 library/colorbox/example5/colorbox.css delete mode 100644 library/colorbox/example5/images/border.png delete mode 100644 library/colorbox/example5/images/controls.png delete mode 100644 library/colorbox/example5/images/loading.gif delete mode 100644 library/colorbox/example5/images/loading_background.png delete mode 100644 library/colorbox/example5/index.html delete mode 100644 library/colorbox/i18n/jquery.colorbox-ar.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-bg.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-bn.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-ca.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-cs.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-da.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-de.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-es.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-et.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-fa.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-fi.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-fr.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-gl.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-gr.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-he.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-hr.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-hu.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-id.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-it.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-ja.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-kr.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-lt.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-lv.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-my.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-nl.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-no.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-pl.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-pt-BR.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-ro.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-ru.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-si.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-sk.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-sr.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-sv.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-tr.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-uk.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-zh-CN.js delete mode 100644 library/colorbox/i18n/jquery.colorbox-zh-TW.js delete mode 100644 library/colorbox/images/border.png delete mode 100644 library/colorbox/images/controls.png delete mode 100644 library/colorbox/images/loading.gif delete mode 100644 library/colorbox/images/loading_background.png delete mode 100644 library/colorbox/jquery.colorbox-min.js delete mode 100644 library/colorbox/jquery.colorbox.js delete mode 100644 library/colorbox/package.json diff --git a/library/colorbox/README.md b/library/colorbox/README.md deleted file mode 100644 index 9473a686a4..0000000000 --- a/library/colorbox/README.md +++ /dev/null @@ -1,616 +0,0 @@ -## About Colorbox: -A customizable lightbox plugin for jQuery. See the [project page](http://jacklmoore.com/colorbox/) for documentation and a demonstration, and the [FAQ](http://jacklmoore.com/colorbox/faq/) for solutions and examples to common issues. Released under the [MIT license](http://www.opensource.org/licenses/mit-license.php). - -## Changelog: - -##### Version 1.6.3 - 2015/07/27 - -* Fixed regression that caused error in IE8 when the calculated initial size was negative. Fixes #741 - -##### Version 1.6.2 - 2015/07/13 - -* Fixed iframe attribute name (allowFullScreen to allowFullscreen). Fixes #737 - -##### Version 1.6.1 - 2015/05/14 - -* Replaced the inline onclick handler for cboxPhoto with a namespaced event for easier unbinding. Fixes #719. - -##### Version 1.6.0 - 2015/03/03 - -* Added two new properties that expose how `` and `