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

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 0f3169fb08d06f85c935e9f1cb8dd3c29e8b10f2..dfd1f94d77ea2d24de56b9c558493deb997bb68f 100644 (file)
--- 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 7badb67ff4705aab81baa6c38e8d85c4d7f26668..3a07cdf9384b354cc094658017d8eab3cb22d5d9 100644 (file)
--- 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 50fa14dbd2f6f9063f00bb9c112a96f75d89b3db..c0db5b811731af0cc3f0ff94736a8298df9a607d 100644 (file)
--- 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 1c7239c1e2d854318e69316d98c7f0f5f2a7572d..5fe20aa57f747601901b7ff3d9f5d7d37b2e3435 100644 (file)
--- 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 c26bccb266066abf51212d222764f42a1ebd7840..42fe981261bf245b58d1f017aedb287360c20eaa 100644 (file)
--- 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 016c43d24086521addbf9b365dc1a56f1a59def2..29f89bd2e463560ce7fee972fb1c8b11a2aa420e 100644 (file)
--- 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 ad77e8230059efd79e4882173b278bc7dedda6da..367e7cac68d6b7521da5c865f1ab79cc6b9e2e2f 100644 (file)
--- 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 eaa13b1f9d09f28fc09d485d72eb557be663d251..629ad78662877519c161a2d34435c9c2dbc506de 100644 (file)
--- 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();
   }