WIP installer refactor, fixes small bug in modal.js (modal window count not being updated correctly)

[TFS Changeset #77122]
This commit is contained in:
starfighter83
2010-09-13 08:15:44 +00:00
parent f498c0635f
commit 092732d748

View File

@@ -18,6 +18,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
return $(this).each(function() {
//check if the modal exists already
if ($(this).closest(".umbModalBox").length > 0) {
Umbraco.Controls.ModalWindow.cntr++;
var api = $(this).closest(".umbModalBox").ModalWindowAPI();
api._obj.jqmShow(); //since it exist, just re-show it
}
@@ -39,7 +40,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
_wId: Umbraco.Utils.generateRandom().toString().replace(".", ""), //the modal window ID that will be assigned
_obj: null, //the jquery element for the modal window
_rVal: null, //a return value specified when closing that gets passed to the onCloseCallback method
_cntr: ++Umbraco.Controls.ModalWindow.cntr, //counts instances
_cntr: Umbraco.Controls.ModalWindow.cntr++, //counts instances
//get a reference to the topmost jquery object if there is a modal framework there, otherwise use current
_$: (window.top.jQuery && window.top.jQuery.jqm) ? window.top.jQuery : $,
//get a reference to the topmost document if we're selecting the topmost jquery, otherwise use the current
@@ -100,6 +101,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
/// outVal = the value passed to the close window method that was used to close the window (if it was specified)
/// <returns>The generated jquery object bound to the modal window</returns>
var _this = this;
this._obj.jqm({