Bugzilla – Attachment 73719 Details for
Bug 17602
Integrate support for RecordedBooks (formerly OneClickDigital) API
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17602: (follow-up) Adjust js paths to use version add spinner
Bug-17602-follow-up-Adjust-js-paths-to-use-version.patch (text/plain), 4.90 KB, created by
Nick Clemens
on 2018-04-05 18:15:30 UTC
(
hide
)
Description:
Bug 17602: (follow-up) Adjust js paths to use version add spinner
Filename:
MIME Type:
Creator:
Nick Clemens
Created:
2018-04-05 18:15:30 UTC
Size:
4.90 KB
patch
obsolete
>From bce6990ef420e4a56d0896634c6c9b768e28a6ed Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Thu, 5 Apr 2018 16:49:58 +0000 >Subject: [PATCH] Bug 17602: (follow-up) Adjust js paths to use version add > spinner > >--- > .../bootstrap/en/modules/opac-recordedbooks-search.tt | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/js/recordedbooks.js | 11 ++++++++++- > 3 files changed, 13 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt >index b384b96..42c8912 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt >@@ -59,8 +59,8 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/recordedbooks.js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/recordedbooks_[% KOHA_VERSION %].js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > var querystring = "[% q |replace( "'", "\'" ) |replace( '\n', '\\n' ) |replace( '\r', '\\r' ) |html %]"; > var results_per_page = [% OPACnumSearchResults || 20 %]; >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 1abe4b0..916ce60 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -1069,7 +1069,7 @@ Using this account is not recommended because some parts of Koha will not functi > </script> > [% END %] > [% IF RecordedBooksCirculation %] >- <script type="text/javascript" src="[% interface %]//[% theme %]/js/recordedbooks.js"></script> >+ <script type="text/javascript" src="[% interface %]//[% theme %]/js/recordedbooks_[% KOHA_VERSION %].js"></script> > <script type="text/JavaScript"> > $(document).ready(function() { > [% IF ( recordedbooks_error ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/recordedbooks.js b/koha-tmpl/opac-tmpl/bootstrap/js/recordedbooks.js >index a6ac515..e0d3203 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/js/recordedbooks.js >+++ b/koha-tmpl/opac-tmpl/bootstrap/js/recordedbooks.js >@@ -89,7 +89,7 @@ KOHA.RecordedBooks = new function() { > $('<div id="action_'+item.isbn+'" class="actions-menu">') > .append(actions) > .appendTo(line); >- >+ $('<span id="waiting_'+item.isbn+'" style="display:none;"><img class="throbber" src="/opac-tmpl/lib/jquery/plugins/themes/classic/throbber.gif" /></span>').appendTo(line); > $(ul_el).append(line); > } > >@@ -156,6 +156,8 @@ KOHA.RecordedBooks = new function() { > > function item_action (params, el) { > var isbn = params.isbn; >+ $("#action_"+isbn).hide(); >+ $("#waiting_"+isbn).show(); > svc_ajax('post', params, function(data) { > if (data.checkouts) { > details.checkouts = data.checkouts; >@@ -164,6 +166,8 @@ KOHA.RecordedBooks = new function() { > details.holds = data.holds; > } > display_actions(el, isbn); >+ $("#action_"+isbn).show(); >+ $("#waiting_"+isbn).hide(); > }); > } > >@@ -233,6 +237,8 @@ KOHA.RecordedBooks = new function() { > if(checkout_popup) { > $(el).append( ajax_button(MSG_CHECK_OUT, function() { > if( confirm(MSG_CHECK_OUT_CONFIRM) ) { >+ $("#action_"+isbn).hide(); >+ $("#waiting_"+isbn).show(); > svc_ajax('post', {action: "checkout", isbn: isbn}, function(data) { > if (data.checkouts) { > details.checkouts = data.checkouts; >@@ -241,6 +247,8 @@ KOHA.RecordedBooks = new function() { > details.holds = data.holds; > } > item = display_actions(el, isbn); >+ $("#action_"+isbn).show(); >+ $("#waiting_"+isbn).hide(); > }); > } > }) ); >@@ -304,6 +312,7 @@ KOHA.RecordedBooks = new function() { > $('<div id="action_'+isbn+'" class="actions-menu">') > .append(actions) > .appendTo(el); >+ $("#action_"+isbn).before('<span id="waiting_'+isbn+'" style="display:none;"><img class="throbber" src="/opac-tmpl/lib/jquery/plugins/themes/classic/throbber.gif" /></span>'); > }; > > this.search = function( q, page_size, page, callback ) { >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17602
:
57402
|
57403
|
57404
|
60855
|
60856
|
60857
|
61866
|
61932
|
62247
|
62248
|
62249
|
62250
|
63392
|
63778
|
63779
|
63780
|
63857
|
64070
|
64071
|
64095
|
64096
|
64098
|
64099
|
64100
|
65988
|
65989
|
66341
|
66342
|
66343
|
67236
|
67237
|
67238
|
67240
|
67859
|
67860
|
69019
|
69020
|
69021
|
69022
|
69023
|
69024
|
69025
|
69026
|
69027
|
69101
|
69357
|
69358
|
69359
|
73708
|
73709
|
73710
|
73711
|
73712
|
73713
|
73714
|
73715
|
73716
|
73717
|
73718
|
73719
|
73725
|
76180
|
76181
|
76182
|
76183
|
76184
|
76185
|
76186
|
76187
|
76188
|
76189
|
76190
|
76191
|
76192
|
76193
|
78602
|
78603
|
78604
|
78605
|
78606
|
78607
|
78608
|
78609
|
78610
|
78611
|
78612
|
78613
|
78614
|
78615
|
79247
|
79668
|
79669
|
79670
|
79671
|
79672
|
79673
|
79674
|
79675
|
79676
|
79677
|
79678
|
79679
|
79680
|
79681
|
79682
|
79752