From a1dd76ba3d8aa605cab6bb30e0c15c2e635c384b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 28 Aug 2012 13:51:25 +0000 Subject: [PATCH] screenChange must cleanup popover and correctly use it on all screen loading git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1378138 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/artifacts-management.js | 1 + .../src/main/webapp/js/archiva/general-admin.js | 2 +- .../archiva-webapp-js/src/main/webapp/js/archiva/main.js | 2 +- .../src/main/webapp/js/archiva/network-proxies.js | 2 +- .../src/main/webapp/js/archiva/proxy-connectors.js | 4 +--- .../src/main/webapp/js/archiva/repositories.js | 2 +- .../archiva-webapp-js/src/main/webapp/js/archiva/search.js | 2 +- .../archiva-webapp-js/src/main/webapp/js/archiva/utils.js | 1 + 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js index 0f3169fb0..dfd1f94d7 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js @@ -69,6 +69,7 @@ define("archiva.artifacts-management",["jquery","i18n","utils","jquery.tmpl","kn } displayUploadArtifact=function(){ + screenChange(); var mainContent=$("#main-content"); mainContent.html(mediumSpinnerImg()); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index 7badb67ff..3a07cdf93 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -239,7 +239,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" }; displayLegacyArtifactPathSupport=function(){ - clearUserMessages(); + screenChange(); var mainContent=$("#main-content"); mainContent.html(mediumSpinnerImg()); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js index 50fa14dbd..c0db5b811 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js @@ -161,7 +161,7 @@ function(jquery,ui,sammy,tmpl) { { text : $.i18n.prop('menu.repository.groups') , id: "menu-repository-groups-list-a" , href: "#repositorygroup" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoryGroups()}}, { text : $.i18n.prop('menu.repositories') , id: "menu-repositories-list-a" , href: "#repositorylist" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoriesGrid()}}, { text : $.i18n.prop('menu.proxy-connectors') , id: "menu-proxy-connectors-list-a" , href: "#proxyconnectors" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayProxyConnectors()}}, - { text : $.i18n.prop('menu.network-proxies') , id: "menu-network-proxies-list-a" , href: "#networkproxies" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayNetworkProxies()}}, + { text : $.i18n.prop('menu.network-proxies') , id: "menu-network-proxies-list-a" , href: "#networkproxies" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayNetworkProxies()}}, { text : $.i18n.prop('menu.legacy-artifact-support') , id: "menu-legacy-support-list-a" , href: "#legacy" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayLegacyArtifactPathSupport()}}, { text : $.i18n.prop('menu.repository-scanning') , id: "menu-repository-scanning-list-a" , href: "#scanningList" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoryScanning()}}, { text : $.i18n.prop('menu.network-configuration') , id: "menu-network-configuration-list-a" , href: "#network" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayNetworkConfiguration()}}, diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js index 1c7239c1e..5fe20aa57 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js @@ -201,7 +201,7 @@ define("archiva.network-proxies",["jquery","i18n","jquery.tmpl","bootstrap","jqu displayNetworkProxies=function(){ - clearUserMessages(); + screenChange(); var mainContent = $("#main-content"); mainContent.html(mediumSpinnerImg()); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js index c26bccb26..42fe98126 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js @@ -442,8 +442,6 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq ko.applyBindings(this,mainContent.find("#proxy-connectors-view").get(0)); var prxGrids=mainContent.find("[id^='proxy-connectors-grid-remoterepo-settings-edit-']"); - - $.log("prxGrids:"+prxGrids.length); prxGrids.popover(); removeSmallSpinnerImg(); mainContent.find("#proxy-connectors-view-tabs #proxy-connectors-view-tabs-a-network-proxies-grid").tab('show'); @@ -518,7 +516,7 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq } displayProxyConnectors=function(){ - clearUserMessages(); + screenChange(); var mainContent = $("#main-content"); mainContent.html($("#proxyConnectorsMain").tmpl()); mainContent.append(smallSpinnerImg()); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js index 016c43d24..29f89bd2e 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js @@ -857,7 +857,7 @@ define("archiva.repositories",["jquery","i18n","jquery.tmpl","bootstrap","jquery //--------------------------- displayRepositoriesGrid=function(){ - clearUserMessages(); + screenChange(); var mainContent = $("#main-content"); mainContent.html(mediumSpinnerImg()); mainContent.html($("#repositoriesMain").tmpl()); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js index ad77e8230..367e7cac6 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js @@ -1744,7 +1744,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno * @param searchViewModelCurrent model to reuse if not null whereas a new one is created. */ displaySearch=function(successCallbackFn,searchViewModelCurrent){ - clearUserMessages(); + screenChange(); var mainContent=$("#main-content"); mainContent.html(mediumSpinnerImg()); $.ajax("restServices/archivaServices/searchService/observableRepoIds", { diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js index eaa13b1f9..629ad7866 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js @@ -116,6 +116,7 @@ require(["jquery","jquery.tmpl","i18n"], function(jquery,jqueryTmpl,i18n) { var mainContent=$("#main-content"); mainContent.html(""); mainContent.removeAttr("data-bind"); + $("#body_content" ).find(".popover" ).hide(); clearUserMessages(); } -- 2.39.5