This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit 68789878a5e703b9956ed1e31d831fd441ca383b Author: Andi Huber <[email protected]> AuthorDate: Fri Oct 21 11:53:33 2022 +0200 ISIS-3142: renaming: batch process all .js files (except antora/*) --- .../sse/wicket/markup/js/ObservingComponent.js | 2 +- ...tstrap-growl.js => causeway-bootstrap-growl.js} | 8 +-- ...nt-events.js => causeway-server-sent-events.js} | 4 +- ....viewer.js => jquery.causeway.wicket.viewer.js} | 60 +++++++++++----------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/js/ObservingComponent.js b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/js/ObservingComponent.js index d1ac315412..7ea895d39c 100644 --- a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/js/ObservingComponent.js +++ b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/markup/js/ObservingComponent.js @@ -20,7 +20,7 @@ window.addEventListener('DOMContentLoaded', function() { (function($) { - isis_sse_observe("${targetId}", "${observing}"); + causeway_sse_observe("${targetId}", "${observing}"); })(jQuery); }); diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/js/isis-bootstrap-growl.js b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/js/causeway-bootstrap-growl.js similarity index 97% rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/js/isis-bootstrap-growl.js rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/js/causeway-bootstrap-growl.js index 4491290d47..18f18e2ff6 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/js/isis-bootstrap-growl.js +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/js/causeway-bootstrap-growl.js @@ -1,5 +1,5 @@ /* -* Project: Bootstrap Growl - v2.0.0 (modified for Apache Isis / Bootstrap 5.1) +* Project: Bootstrap Growl - v2.0.0 (modified for Apache Causeway / Bootstrap 5.1) * Description: Turns standard Bootstrap alerts into "Growl-like" notifications. * Author: Mouse0270 aka Robert McIntosh * License: MIT License @@ -19,7 +19,7 @@ }, offset: 20, spacing: 10, - z_index: 999, // modified for Apache Isis (origin: 1031), + z_index: 999, // modified for Apache Causeway (origin: 1031), delay: 5000, timer: 1000, url_target: '_blank', @@ -33,7 +33,7 @@ onHide: null, onHidden: null, icon_type: 'class', - // modified for Apache Isis (as of Bootstrap 5.1) ... + // modified for Apache Causeway (as of Bootstrap 5.1) ... template: '<div data-growl="container" class="toast align-items-center text-white border-0" role="alert" aria-live="assertive" aria-atomic="true">' + '<div class="d-flex">' + '<div class="toast-body">' @@ -320,4 +320,4 @@ return plugin; }; -})( jQuery, window, document ); \ No newline at end of file +})( jQuery, window, document ); diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/serversentevents/js/isis-server-sent-events.js b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/serversentevents/js/causeway-server-sent-events.js similarity index 96% rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/serversentevents/js/isis-server-sent-events.js rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/serversentevents/js/causeway-server-sent-events.js index 7881aee083..9fb7537128 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/serversentevents/js/isis-server-sent-events.js +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/serversentevents/js/causeway-server-sent-events.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -function isis_sse_observe(targetId, observing) { +function causeway_sse_observe(targetId, observing) { function updateField(newValue) { document.getElementById(targetId).innerHTML = newValue; @@ -52,4 +52,4 @@ function isis_sse_observe(targetId, observing) { updateField("Sorry, your browser does not support server-sent events."); } -} \ No newline at end of file +} diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/viewer/js/jquery.isis.wicket.viewer.js b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/viewer/js/jquery.causeway.wicket.viewer.js similarity index 83% rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/viewer/js/jquery.isis.wicket.viewer.js rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/viewer/js/jquery.causeway.wicket.viewer.js index 73147e0d3b..83c40ae097 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/viewer/js/jquery.isis.wicket.viewer.js +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/viewer/js/jquery.causeway.wicket.viewer.js @@ -20,11 +20,11 @@ $(function() { 'use strict'; - if (typeof(Isis) === 'object' && typeof(Isis.openInNewTab) === 'function') { + if (typeof(Causeway) === 'object' && typeof(Causeway.openInNewTab) === 'function') { return; } - window.Isis = { + window.Causeway = { Topic: { OPEN_IN_NEW_TAB: 'openInNewTab', OPEN_SELECT2: 'openSelect2', @@ -50,66 +50,66 @@ $(function() { $(document, '.modal').on('show.bs.modal', centerModals); $(window).on('resize', centerModals); - var isisVeilTimeoutId; + var causewayVeilTimeoutId; - var isisShowVeil = function() { - if(isisVeilTimeoutId) { - clearTimeout(isisVeilTimeoutId); - isisVeilTimeoutId = null; + var causewayShowVeil = function() { + if(causewayVeilTimeoutId) { + clearTimeout(causewayVeilTimeoutId); + causewayVeilTimeoutId = null; } $("#veil").show(); }; - var isisFadeInVeil = function(attributes, jqxhr, settings) { + var causewayFadeInVeil = function(attributes, jqxhr, settings) { // use timeouts because JQuery's delay(...) cannot be stopped. - if(isisVeilTimeoutId) { + if(causewayVeilTimeoutId) { // already queued a fade-in return; } - isisVeilTimeoutId = setTimeout(function() { + causewayVeilTimeoutId = setTimeout(function() { $("#veil").fadeIn(750); }, 250); }; - var isisHideVeil = function() { - if(isisVeilTimeoutId) { - clearTimeout(isisVeilTimeoutId); - isisVeilTimeoutId = null; + var causewayHideVeil = function() { + if(causewayVeilTimeoutId) { + clearTimeout(causewayVeilTimeoutId); + causewayVeilTimeoutId = null; } $("#veil").stop().hide(); }; - Wicket.Event.subscribe(Isis.Topic.OPEN_IN_NEW_TAB, function(jqEvent, url) { + Wicket.Event.subscribe(Causeway.Topic.OPEN_IN_NEW_TAB, function(jqEvent, url) { var win=window.open(url, '_blank'); if(win) { win.focus(); } }); - Wicket.Event.subscribe(Isis.Topic.OPEN_SELECT2, function(jqEvent, panelId) { + Wicket.Event.subscribe(Causeway.Topic.OPEN_SELECT2, function(jqEvent, panelId) { setTimeout(function() { var $panel = $('#'+panelId); - //console.log('Isis.Topic.OPEN_SELECT2: panelId=' + panelId); + //console.log('Causeway.Topic.OPEN_SELECT2: panelId=' + panelId); $($panel).find('select').select2('open'); //$($panel).find('select').filter(':visible:first').focus(); }, 0); }); -// Wicket.Event.subscribe(Isis.Topic.CLOSE_SELECT2, function(jqEvent, panelId) { +// Wicket.Event.subscribe(Causeway.Topic.CLOSE_SELECT2, function(jqEvent, panelId) { // setTimeout(function() { // var $panel = $('#'+panelId); -// //console.log('Isis.Topic.CLOSE_SELECT2: panelId=' + panelId); +// //console.log('Causeway.Topic.CLOSE_SELECT2: panelId=' + panelId); // //$($panel).find('select').select2('close'); // //$($panel).find('select').filter(':visible:first').focus(); // }, 0); // }); - Wicket.Event.subscribe(Isis.Topic.FOCUS_FIRST_PARAMETER, function(jqEvent, elementId) { + Wicket.Event.subscribe(Causeway.Topic.FOCUS_FIRST_PARAMETER, function(jqEvent, elementId) { setTimeout(function() { let el = $('#'+elementId).find('.inputFormTable.parameters') .find('input,textarea,div.cbx,select').filter(':visible:first'); if(el) { - //console.log('Isis.Topic.FOCUS_FIRST_PARAMETER: elementId=' + elementId); + //console.log('Causeway.Topic.FOCUS_FIRST_PARAMETER: elementId=' + elementId); let elNodeName = $(el).prop('nodeName') if (elNodeName) { @@ -129,7 +129,7 @@ $(function() { }, 0); }); - Wicket.Event.subscribe(Isis.Topic.FOCUS_FIRST_PROPERTY, function(jqEvent, elementId) { + Wicket.Event.subscribe(Causeway.Topic.FOCUS_FIRST_PROPERTY, function(jqEvent, elementId) { setTimeout(function() { if(elementId) { $("#" + elementId).find('a.scalarValueInlinePromptLink').filter(':visible:first').focus(); @@ -142,20 +142,20 @@ $(function() { /* for modal dialogs */ Wicket.Event.subscribe(Wicket.Event.Topic.AJAX_CALL_BEFORE_SEND, function(jqEvent, attributes, jqXHR, settings) { if (attributes.c !== window && !$('#'+attributes.c).hasClass('noVeil')) { - isisFadeInVeil(attributes, jqXHR, settings); + causewayFadeInVeil(attributes, jqXHR, settings); } }); Wicket.Event.subscribe(Wicket.Event.Topic.AJAX_CALL_COMPLETE, function(jqEvent, attributes, jqXHR, status) { - isisHideVeil(/*attributes, jqXHR, status*/); + causewayHideVeil(/*attributes, jqXHR, status*/); }); /* only seem to work in non-modal situation */ - $('.buttons .okButton:not(.noVeil)').click(isisFadeInVeil); - $('.buttons .ok:not(.noVeil)').click(isisFadeInVeil); - $('.cssSubMenuItemsPanel .cssSubMenuItem a:not(.noVeil)').click(isisFadeInVeil); + $('.buttons .okButton:not(.noVeil)').click(causewayFadeInVeil); + $('.buttons .ok:not(.noVeil)').click(causewayFadeInVeil); + $('.cssSubMenuItemsPanel .cssSubMenuItem a:not(.noVeil)').click(causewayFadeInVeil); $('div.collectionContentsAsAjaxTablePanel > table.contents > tbody > tr.reloaded-after-concurrency-exception') .livequery(function(){ @@ -170,13 +170,13 @@ $(function() { */ $('body').keydown(function(e) { if (e.which === 221 && e.altKey) { - if (Isis.copyModalShown) { + if (Causeway.copyModalShown) { $('.copyModal').modal('hide'); $('.modal-backdrop').remove(); - Isis.copyModalShown = false; + Causeway.copyModalShown = false; } else { - Isis.copyModalShown = true; + Causeway.copyModalShown = true; $('.copyLink').click(); } }
