Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2012-08-28 13:51:25 +00:00
parent a497642645
commit a1dd76ba3d
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
View File

@ -69,6 +69,7 @@ define("archiva.artifacts-management",["jquery","i18n","utils","jquery.tmpl","kn
} }
displayUploadArtifact=function(){ displayUploadArtifact=function(){
screenChange();
var mainContent=$("#main-content"); var mainContent=$("#main-content");
mainContent.html(mediumSpinnerImg()); mainContent.html(mediumSpinnerImg());

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
View File

@ -239,7 +239,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
}; };
displayLegacyArtifactPathSupport=function(){ displayLegacyArtifactPathSupport=function(){
clearUserMessages(); screenChange();
var mainContent=$("#main-content"); var mainContent=$("#main-content");
mainContent.html(mediumSpinnerImg()); mainContent.html(mediumSpinnerImg());

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
View File

@ -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.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.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.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.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.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()}}, { text : $.i18n.prop('menu.network-configuration') , id: "menu-network-configuration-list-a" , href: "#network" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayNetworkConfiguration()}},

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
View File

@ -201,7 +201,7 @@ define("archiva.network-proxies",["jquery","i18n","jquery.tmpl","bootstrap","jqu
displayNetworkProxies=function(){ displayNetworkProxies=function(){
clearUserMessages(); screenChange();
var mainContent = $("#main-content"); var mainContent = $("#main-content");
mainContent.html(mediumSpinnerImg()); mainContent.html(mediumSpinnerImg());

4
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
View File

@ -442,8 +442,6 @@ define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jq
ko.applyBindings(this,mainContent.find("#proxy-connectors-view").get(0)); ko.applyBindings(this,mainContent.find("#proxy-connectors-view").get(0));
var prxGrids=mainContent.find("[id^='proxy-connectors-grid-remoterepo-settings-edit-']"); var prxGrids=mainContent.find("[id^='proxy-connectors-grid-remoterepo-settings-edit-']");
$.log("prxGrids:"+prxGrids.length);
prxGrids.popover(); prxGrids.popover();
removeSmallSpinnerImg(); removeSmallSpinnerImg();
mainContent.find("#proxy-connectors-view-tabs #proxy-connectors-view-tabs-a-network-proxies-grid").tab('show'); 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(){ displayProxyConnectors=function(){
clearUserMessages(); screenChange();
var mainContent = $("#main-content"); var mainContent = $("#main-content");
mainContent.html($("#proxyConnectorsMain").tmpl()); mainContent.html($("#proxyConnectorsMain").tmpl());
mainContent.append(smallSpinnerImg()); mainContent.append(smallSpinnerImg());

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
View File

@ -857,7 +857,7 @@ define("archiva.repositories",["jquery","i18n","jquery.tmpl","bootstrap","jquery
//--------------------------- //---------------------------
displayRepositoriesGrid=function(){ displayRepositoriesGrid=function(){
clearUserMessages(); screenChange();
var mainContent = $("#main-content"); var mainContent = $("#main-content");
mainContent.html(mediumSpinnerImg()); mainContent.html(mediumSpinnerImg());
mainContent.html($("#repositoriesMain").tmpl()); mainContent.html($("#repositoriesMain").tmpl());

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
View File

@ -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. * @param searchViewModelCurrent model to reuse if not null whereas a new one is created.
*/ */
displaySearch=function(successCallbackFn,searchViewModelCurrent){ displaySearch=function(successCallbackFn,searchViewModelCurrent){
clearUserMessages(); screenChange();
var mainContent=$("#main-content"); var mainContent=$("#main-content");
mainContent.html(mediumSpinnerImg()); mainContent.html(mediumSpinnerImg());
$.ajax("restServices/archivaServices/searchService/observableRepoIds", { $.ajax("restServices/archivaServices/searchService/observableRepoIds", {

1
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
View File

@ -116,6 +116,7 @@ require(["jquery","jquery.tmpl","i18n"], function(jquery,jqueryTmpl,i18n) {
var mainContent=$("#main-content"); var mainContent=$("#main-content");
mainContent.html(""); mainContent.html("");
mainContent.removeAttr("data-bind"); mainContent.removeAttr("data-bind");
$("#body_content" ).find(".popover" ).hide();
clearUserMessages(); clearUserMessages();
} }