WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/web/_form_new_version_page.asp

         element.removeChild(element.firstChild); // remove all existing content
     element.appendChild(document.createTextNode(text));
+    }
+}
+/////////////////////////////////////////////////////////////////
+//  Local versions of showGlobalProgress and hideGlobalProgress
+//  used to abstract the use of iframes.
+//
+<%If NOT bInIframe Then %>
+    function localShowGlobalProgress() {
+        showGlobalProgress()
+    }
+    function localHideGlobalProgress() {
+        hideGlobalProgress();
+    }
+<%Else%>
+    function localShowGlobalProgress() {
+        window.parent.showGlobalProgress()
+    }
+    function localHideGlobalProgress() {
+        window.parent.hideGlobalProgress();
+    }
+<%End If%>
 //////////////////////////////////////////////////////////////////
 // Function: changeToAutoVersionNumberAssignment
 //
 // Purpose: Hide the relevant sections of the form
 //
         reseteMessage();
         MM_validateForm("--Silent",'FRpkgName','Package Name','RisPackage');
         checkPackageHighlight( ! document.MM_returnValue, 'Name well formed', 'Invalid Characters in name');
         if ( ! document.MM_returnValue ) return jQuery.Deferred().resolve();;
-        showGlobalProgress();
+        localShowGlobalProgress();
         return jQuery.get('_json_checkPackage.asp',{
                        packageName :  document.getElementById('FRpkgName').value,
                        Opr : 'checkName'
                    }, function(){}, 'json'
             ).done(function(data, textStatus, jqXHR){
                     checkPackageHighlight( 1, '','Error in AJAX operation');
+                }
             }).fail(function(jqXHR, textStatus, errorThrown){
                 checkPackageHighlight( 1, '','Error in AJAX operation');
             }).always(function(){
-                hideGlobalProgress();
+                localHideGlobalProgress();
                 resizeFrame();
             });
+    }
     return jQuery.Deferred().resolve();
+}
             showeMessage(document.MM_error);
             fieldError = true;
             return jQuery.Deferred().resolve();
+        }
-        showGlobalProgress();
+        localShowGlobalProgress();
         return jQuery.get('_json_checkPackage.asp',{
                        packageName :  document.getElementById('FRpkgName').value,
                        Opr : 'checkVer',
                        Version : document.all['FRvnumber'].value + document.all['v_ext'].value
                    }, function(){}, 'json'
                         setIdText('vnError','');
+                    }
             }).fail(function(jqXHR, textStatus, errorThrown){
                 checkPackageHighlight( 1, '','Error in AJAX operation');
             }).always(function(){
-                hideGlobalProgress();
+                localHideGlobalProgress();
                 resizeFrame();
             });
+    }
+}
+           }
        }).fail(function(jqXHR, textStatus, errorThrown){
            checkPackageHighlight( 1, '','Error in AJAX operation');
        }).always(function(){
-           hideGlobalProgress();
+           localHideGlobalProgress();
            resizeFrame();
        });
+}
 <%End If%>
                     //  Export the change_type field in a sanitised form
                     var ct = getCheckedRadio(document.forms.NEWversion.elements.change_type1).value;
                     if(!document.NEWversion.version_type[0].checked) ct = 'F';
                     document.all['change_type'].value = ct;
-                    showGlobalProgress();
+                    localShowGlobalProgress();
                     <%If parRename <> "" Then%>
                         updateVersionInfo().always(function(){
                             if (!fieldError)
+                            {
                                 <%If NOT bInIframe Then %>
                         f.submit();
                         return false;
                     <%End If%>
+                }
                 // Hide progress bar that is exposed because the previous tests were OK
-                hideGlobalProgress();
+                localHideGlobalProgress();
                 resizeFrame();
                 checkMode = 0;
             });
         });
+    }

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/web/_form_new_version_page.asp – Rev 7292 → 7382