Author: olamy
Date: Tue Aug 28 13:51:25 2012
New Revision: 1378138
URL: http://svn.apache.org/viewvc?rev=1378138&view=rev
Log:
screenChange must cleanup popover and correctly use it on all screen loading
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js?rev=1378138&r1=1378137&r2=1378138&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
Tue Aug 28 13:51:25 2012
@@ -69,6 +69,7 @@ define("archiva.artifacts-management",["
}
displayUploadArtifact=function(){
+ screenChange();
var mainContent=$("#main-content");
mainContent.html(mediumSpinnerImg());
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1378138&r1=1378137&r2=1378138&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Tue Aug 28 13:51:25 2012
@@ -239,7 +239,7 @@ define("archiva.general-admin",["jquery"
};
displayLegacyArtifactPathSupport=function(){
- clearUserMessages();
+ screenChange();
var mainContent=$("#main-content");
mainContent.html(mediumSpinnerImg());
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1378138&r1=1378137&r2=1378138&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Tue Aug 28 13:51:25 2012
@@ -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()}},
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1378138&r1=1378137&r2=1378138&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
Tue Aug 28 13:51:25 2012
@@ -201,7 +201,7 @@ define("archiva.network-proxies",["jquer
displayNetworkProxies=function(){
- clearUserMessages();
+ screenChange();
var mainContent = $("#main-content");
mainContent.html(mediumSpinnerImg());
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1378138&r1=1378137&r2=1378138&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
Tue Aug 28 13:51:25 2012
@@ -442,8 +442,6 @@ define("archiva.proxy-connectors",["jque
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",["jque
}
displayProxyConnectors=function(){
- clearUserMessages();
+ screenChange();
var mainContent = $("#main-content");
mainContent.html($("#proxyConnectorsMain").tmpl());
mainContent.append(smallSpinnerImg());
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1378138&r1=1378137&r2=1378138&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
Tue Aug 28 13:51:25 2012
@@ -857,7 +857,7 @@ define("archiva.repositories",["jquery",
//---------------------------
displayRepositoriesGrid=function(){
- clearUserMessages();
+ screenChange();
var mainContent = $("#main-content");
mainContent.html(mediumSpinnerImg());
mainContent.html($("#repositoriesMain").tmpl());
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1378138&r1=1378137&r2=1378138&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Tue Aug 28 13:51:25 2012
@@ -1744,7 +1744,7 @@ define("archiva.search",["jquery","i18n"
* @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", {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1378138&r1=1378137&r2=1378138&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Tue Aug 28 13:51:25 2012
@@ -116,6 +116,7 @@ require(["jquery","jquery.tmpl","i18n"],
var mainContent=$("#main-content");
mainContent.html("");
mainContent.removeAttr("data-bind");
+ $("#body_content" ).find(".popover" ).hide();
clearUserMessages();
}
