diff --git a/composer.json b/composer.json index 742ad5db0f0de13713aff5df228b7a7c6d9f46c5..975bdf7a1fe11cba5f112bcdbd3de3e67beb59a7 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,19 @@ } } }, + { + "type": "package", + "package": { + "name": "browserstate/history.js", + "version": "1.8.0", + "type": "drupal-library", + "source": { + "url": "https://github.com/browserstate/history.js", + "type": "git", + "reference": "origin/master" + } + } + }, { "type": "package", "package": { @@ -49,6 +62,7 @@ ], "require": { "php": ">=7.0.8", + "browserstate/history.js": "^1.8", "composer/installers": "^1.0.20", "cweagans/composer-patches": "^1.0", "desandro/imagesloaded": "4.1.4", @@ -130,6 +144,7 @@ "drupal/userprotect": "1.0", "drupal/video_embed_field": "2.0", "drupal/views_accordion": "1.0-beta2", + "drupal/views_ajax_history": "^1.0", "drupal/views_autocomplete_filters": "1.1", "drupal/views_bootstrap": "3.x-dev", "drupal/views_bulk_operations": "2.4", diff --git a/composer.lock b/composer.lock index 423bd6c964a950eaddd0c2afed834b0bb918a529..94cffbc5b7b7f1bd5a3e1806413e96be018715fe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "844e9f7f4727de9fb76de196d29d0a23", + "content-hash": "38ff665bca32a20d84b8278ac0343bef", "packages": [ { "name": "alchemy/zippy", @@ -122,6 +122,16 @@ ], "time": "2017-12-20T14:37:45+00:00" }, + { + "name": "browserstate/history.js", + "version": "1.8.0", + "source": { + "type": "git", + "url": "https://github.com/browserstate/history.js", + "reference": "origin/master" + }, + "type": "drupal-library" + }, { "name": "commerceguys/addressing", "version": "v1.0.0", @@ -2516,7 +2526,8 @@ "merge-extra": false }, "patches_applied": { - "2799049": "https://www.drupal.org/files/issues/role_based_email_access-2799049-2.patch" + "2799049": "https://www.drupal.org/files/issues/role_based_email_access-2799049-2.patch", + "2786577": "https://www.drupal.org/files/issues/2786577-270_0.patch" } }, "autoload": { @@ -6292,6 +6303,65 @@ "issues": "https://www.drupal.org/project/issues/views_accordion" } }, + { + "name": "drupal/views_ajax_history", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://git.drupal.org/project/views_ajax_history", + "reference": "8.x-1.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/views_ajax_history-8.x-1.0.zip", + "reference": "8.x-1.0", + "shasum": "ef23bf3a8e1c902b98d4556203dd8fc7068dfcb5" + }, + "require": { + "drupal/core": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.0", + "datestamp": "1535376480", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "amateescu", + "homepage": "https://www.drupal.org/user/729614" + }, + { + "name": "joelpittet", + "homepage": "https://www.drupal.org/user/160302" + }, + { + "name": "kalman.hosszu", + "homepage": "https://www.drupal.org/user/267481" + }, + { + "name": "nod_", + "homepage": "https://www.drupal.org/user/598310" + } + ], + "description": "Add bookmarking abilities to AJAX Views.", + "homepage": "https://www.drupal.org/project/views_ajax_history", + "support": { + "source": "http://cgit.drupalcode.org/views_ajax_history" + } + }, { "name": "drupal/views_autocomplete_filters", "version": "1.1.0", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index dbab98684165fe5c6fbe0fec1ddc5b42fc0c3e9d..036bd3b880ea793b83b6a5a3b217d83c15a1bb8e 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -119,6 +119,18 @@ "stack" ] }, + { + "name": "browserstate/history.js", + "version": "1.8.0", + "version_normalized": "1.8.0.0", + "source": { + "type": "git", + "url": "https://github.com/browserstate/history.js", + "reference": "origin/master" + }, + "type": "drupal-library", + "installation-source": "source" + }, { "name": "commerceguys/addressing", "version": "v1.0.0", @@ -6490,6 +6502,67 @@ "issues": "https://www.drupal.org/project/issues/views_accordion" } }, + { + "name": "drupal/views_ajax_history", + "version": "1.0.0", + "version_normalized": "1.0.0.0", + "source": { + "type": "git", + "url": "https://git.drupal.org/project/views_ajax_history", + "reference": "8.x-1.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/views_ajax_history-8.x-1.0.zip", + "reference": "8.x-1.0", + "shasum": "ef23bf3a8e1c902b98d4556203dd8fc7068dfcb5" + }, + "require": { + "drupal/core": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.0", + "datestamp": "1535376480", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "installation-source": "dist", + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "amateescu", + "homepage": "https://www.drupal.org/user/729614" + }, + { + "name": "joelpittet", + "homepage": "https://www.drupal.org/user/160302" + }, + { + "name": "kalman.hosszu", + "homepage": "https://www.drupal.org/user/267481" + }, + { + "name": "nod_", + "homepage": "https://www.drupal.org/user/598310" + } + ], + "description": "Add bookmarking abilities to AJAX Views.", + "homepage": "https://www.drupal.org/project/views_ajax_history", + "support": { + "source": "http://cgit.drupalcode.org/views_ajax_history" + } + }, { "name": "drupal/views_autocomplete_filters", "version": "1.1.0", diff --git a/web/libraries/history.js b/web/libraries/history.js new file mode 160000 index 0000000000000000000000000000000000000000..d213d8cb22e8fd1cf1c9963925e4989f8903b483 --- /dev/null +++ b/web/libraries/history.js @@ -0,0 +1 @@ +Subproject commit d213d8cb22e8fd1cf1c9963925e4989f8903b483 diff --git a/web/modules/views_ajax_history/LICENSE.txt b/web/modules/views_ajax_history/LICENSE.txt new file mode 100644 index 0000000000000000000000000000000000000000..d159169d1050894d3ea3b98e1c965c4058208fe1 --- /dev/null +++ b/web/modules/views_ajax_history/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/web/modules/views_ajax_history/js/views_ajax_history.js b/web/modules/views_ajax_history/js/views_ajax_history.js new file mode 100644 index 0000000000000000000000000000000000000000..dbd33f7f296353c75a2ec31bc2408bf5e04f944c --- /dev/null +++ b/web/modules/views_ajax_history/js/views_ajax_history.js @@ -0,0 +1,271 @@ +(function ($, Drupal, drupalSettings) { + + // Need to keep this to check if there are extra parameters in the original URL. + var original = { + path: window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '') + window.location.pathname, + // @TODO integrate #1359798 without breaking history.js + query: window.location.search || '' + }; + + /** + * Keep the original beforeSubmit method to use it later. + */ + var beforeSubmit = Drupal.Ajax.prototype.beforeSubmit; + + /** + * Keep the original beforeSerialize method to use it later. + */ + var beforeSerialize = Drupal.Ajax.prototype.beforeSerialize; + + /** + * Keep the original beforeSend method to use it later. + */ + var beforeSend = Drupal.Ajax.prototype.beforeSend; + + Drupal.behaviors.viewsAjaxHistory = { + attach: function (context, drupalSettings) { + // Init the current page too, because the first loaded pager element do + // not have loadable history and will not work the back button. + var $body = $('body').once('views-ajax-history-first-page-load'); + if ($body.length) { + drupalSettings.viewsAjaxHistory.onloadPageItem = drupalSettings.viewsAjaxHistory.renderPageItem; + } + } + }; + + /** + * Modification of Drupal.Views.parseQueryString() to allow extracting multivalues fields + * + * @param query + * String, either a full url or just the query string. + */ + var parseQueryString = function (query) { + var args = {}; + var pos = query.indexOf('?'); + if (pos != -1) { + query = query.substring(pos + 1); + } + var pairs = query.split('&'); + var pair, key, value; + for(var i in pairs) { + if (typeof(pairs[i]) == 'string') { + pair = pairs[i].split('='); + // Ignore the 'q' path argument, if present. + if (pair[0] != 'q' && pair[1]) { + key = decodeURIComponent(pair[0].replace(/\+/g, ' ')); + value = decodeURIComponent(pair[1].replace(/\+/g, ' ')); + // field name ends with [], it's multivalues + if (/\[\]$/.test(key)) { + if (!(key in args)) { + args[key] = [value]; + } + // don't duplicate values + else if (!$.inArray(value, args[key]) !== -1) { + args[key].push(value); + } + } + else { + args[key] = value; + } + } + } + } + return args; + }; + + /** + * Strip views values and duplicates from URL + * + * @param url + * String with the full URL to clean up. + * @param viewArgs + * Object containing field values from views. + * + * @return url + * String URL with views values and reduced duplicates. + */ + var cleanURL = function (url, viewArgs) { + var args = parseQueryString(url); + var query = []; + + // With clean urls off we need to add the 'q' parameter. + if (/\?/.test(drupalSettings.views.ajax_path)) { + query.push('q=' + Drupal.Views.getPath(url)); + } + + $.each(args, function (name, value) { + // use values from viewArgs if they exists + if (name in viewArgs) { + value = viewArgs[name]; + } + if ($.isArray(value)) { + $.merge(query, $.map(value, function (sub) { + return name + '=' + sub; + })); + } + else { + query.push(name + '=' + value); + } + }); + + url = url.split('?'); + return url[0] + (query.length ? '?' + query.join('&') : ''); + }; + + /** + * Parse a URL query string + * + * @param queryString + * String containing the query to parse. + */ + var parseQuery = function(queryString) { + var query = {}; + $.map(queryString.split('&'), function(val) { + var s = val.split('='); + query[s[0]] = s[1]; + }); + return query; + }; + + /** + * Unbind 'popstate' when adding a new state to avoid an infinite loop. + * + * We only use the 'popstate' event to trigger refresh on back of forward click. + * + * @param options + * Object containing the values from views' AJAX call. + * @param url + * String with the current URL to be cleaned up. + */ + var addState = function (options, url) { + // The data in the history state must be serializable. + var historyOptions = $.extend({}, options) + delete historyOptions.beforeSend; + delete historyOptions.beforeSerialize; + delete historyOptions.beforeSubmit; + delete historyOptions.complete; + delete historyOptions.success; + + // Store the actual view's dom id. + drupalSettings.viewsAjaxHistory.lastViewDomID = options.data.view_dom_id; + $(window).unbind('popstate', loadView); + history.pushState(historyOptions, document.title, cleanURL(url, options.data)); + $(window).bind('popstate', loadView); + }; + + /** + * Make an AJAX request to update the view when navigating back and forth. + */ + var loadView = function () { + var options; + + // This should be the first loaded page, so init the options object. + if (history.state === null) { + var viewsAjaxSettingsKey = 'views_dom_id:' + drupalSettings.viewsAjaxHistory.lastViewDomID; + if (drupalSettings.views.ajaxViews.hasOwnProperty(viewsAjaxSettingsKey)) { + var viewsAjaxSettings = drupalSettings.views.ajaxViews[viewsAjaxSettingsKey]; + viewsAjaxSettings.page = drupalSettings.viewsAjaxHistory.onloadPageItem; + options = { + data: viewsAjaxSettings, + url: drupalSettings.views.ajax_path + }; + } + } + else { + options = history.state; + } + + // Drupal's AJAX options. + var settings = $.extend({ + submit: options.data, + setClick: true, + event: 'click', + selector: '.view-dom-id-' + options.data.view_dom_id, + progress: { type: 'throbber' } + }, options); + + var viewsAjaxSubmit = Drupal.ajax(settings); + // Trigger ajax call. + viewsAjaxSubmit.execute(); + }; + + /** + * Override beforeSerialize to handle click on pager links + * + * @param $element + * jQuery DOM element + * @param options + */ + Drupal.Ajax.prototype.beforeSerialize = function (element, options) { + // Check that we handle a click on a link, not a form submission. + if (options.data.view_name && element && $(element).is('a')) { + addState(options, $(element).attr('href')); + } + + // Call the original Drupal method with the right context. + beforeSerialize.apply(this, arguments); + }; + + /** + * Override beforeSubmit to handle exposed form submissions. + * + * @param form_values + * Object with all field values. + * @param element + * jQuery DOM form element. + * @param options + * Object containing AJAX options. + */ + Drupal.Ajax.prototype.beforeSubmit = function (form_values, element, options) { + if (options.data.view_name) { + var url = original.path + '?' + element.formSerialize(); + var currentQuery = parseQueryString(window.location.href); + + // copy selected values in history state + $.each(form_values, function () { + // field name ending with [] is a multi value field + if (/\[\]$/.test(this.name)) { + if (!options.data[this.name]) { + options.data[this.name] = []; + } + options.data[this.name].push(this.value); + } + // regular field + else { + options.data[this.name] = this.value; + } + // Remove exposed data from the current query to leave behind any + // non exposed form related query vars + if (currentQuery[this.name]) { + delete currentQuery[this.name]; + } + }); + + url += (/\?/.test(url) ? '&' : '?') + $.param(currentQuery); + addState(options, url); + } + // Call the original Drupal method with the right context. + beforeSubmit.apply(this, arguments); + }; + + /** + * Override beforeSend to clean up the Ajax submission URL. + * + * @param {XMLHttpRequest} xmlhttprequest + * Native Ajax object. + * @param {object} options + * jQuery.ajax options. + */ + Drupal.Ajax.prototype.beforeSend = function (xmlhttprequest, options) { + var data = (typeof options.data === 'string') ? parseQuery(options.data) : {}; + + if (data.view_name && options.type !== 'GET') { + // Override the URL to not contain any fields that were submitted. + options.url = drupalSettings.views.ajax_path + '?' + Drupal.ajax.WRAPPER_FORMAT + '=drupal_ajax'; + + // Call the original Drupal method with the right context. + beforeSend.apply(this, arguments); + } + } + +})(jQuery, Drupal, drupalSettings); diff --git a/web/modules/views_ajax_history/views_ajax_history.info.yml b/web/modules/views_ajax_history/views_ajax_history.info.yml new file mode 100644 index 0000000000000000000000000000000000000000..3213b27e8143adc51194a73df78afd431ffc36fb --- /dev/null +++ b/web/modules/views_ajax_history/views_ajax_history.info.yml @@ -0,0 +1,13 @@ +type: module +name: 'Views AJAX History' +description: 'Add bookmarking abilities to AJAX Views.' +# core: 8.x +package: Views +dependencies: + - views + +# Information added by Drupal.org packaging script on 2018-08-27 +version: '8.x-1.0' +core: '8.x' +project: 'views_ajax_history' +datestamp: 1535376604 diff --git a/web/modules/views_ajax_history/views_ajax_history.libraries.yml b/web/modules/views_ajax_history/views_ajax_history.libraries.yml new file mode 100644 index 0000000000000000000000000000000000000000..1dce5e3d9fdff28c734736414926c6f9d06d5004 --- /dev/null +++ b/web/modules/views_ajax_history/views_ajax_history.libraries.yml @@ -0,0 +1,11 @@ +history: + version: VERSION + js: + js/views_ajax_history.js: {} + dependencies: + - core/jquery + - core/drupal + - core/drupalSettings + - core/jquery.once + - core/jquery.form + - core/drupal.ajax diff --git a/web/modules/views_ajax_history/views_ajax_history.module b/web/modules/views_ajax_history/views_ajax_history.module new file mode 100644 index 0000000000000000000000000000000000000000..d335bdaea60e524636f6dc95cfc9a6f4d6d7925c --- /dev/null +++ b/web/modules/views_ajax_history/views_ajax_history.module @@ -0,0 +1,20 @@ +<?php + +/** + * @file + * Add bookmarking abilities to AJAX Views. + */ + +use \Drupal\views\ViewExecutable; + +/** + * Implements hook_views_pre_render(). + */ +function views_ajax_history_views_pre_render(ViewExecutable $view) { + if ($view->ajaxEnabled() && empty($view->is_attachment) && empty($view->live_preview)) { + // @TODO add option to views form for html4+html5 or html5 only + $view->element['#attached']['library'][] = 'views_ajax_history/history'; + $view->element['#attached']['drupalSettings']['viewsAjaxHistory'] = ['renderPageItem' => pager_find_page()]; + $view->element['#cache']['contexts'][] = 'url.query_args.pagers'; + } +}