mirror of https://github.com/apache/archiva.git
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:
parent
a497642645
commit
a1dd76ba3d
|
@ -69,6 +69,7 @@ define("archiva.artifacts-management",["jquery","i18n","utils","jquery.tmpl","kn
|
|||
}
|
||||
|
||||
displayUploadArtifact=function(){
|
||||
screenChange();
|
||||
var mainContent=$("#main-content");
|
||||
mainContent.html(mediumSpinnerImg());
|
||||
|
||||
|
|
|
@ -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());
|
||||
|
||||
|
|
|
@ -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());
|
||||
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -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", {
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue