Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Commit 1126621

Browse files
author
Gabriel Schulhof
committed
Revert "Introduce and use the event "enhancecomplete""
This reverts commit 394273e.
1 parent 394273e commit 1126621

File tree

5 files changed

+2
-50
lines changed

5 files changed

+2
-50
lines changed

js/jquery.mobile.buttonMarkup.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,6 @@ $( document ).bind( "pagecreate create", function( e ) {
304304
.jqmEnhanceable()
305305
.not( "button, input, .ui-btn, :jqmData(role='none'), :jqmData(role='nojs')" )
306306
.buttonMarkup();
307-
308-
$( e.target ).trigger( "enhancecomplete", "buttonMarkup" );
309307
});
310308

311309
})( jQuery );

js/widgets/controlgroup.js

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
define( [ "jquery",
99
"../jquery.mobile.buttonMarkup",
10+
"./forms/button",
1011
"../jquery.mobile.widget" ], function( $ ) {
1112
//>>excludeEnd("jqmBuildExclude");
1213
(function( $, undefined ) {
@@ -100,52 +101,8 @@ define( [ "jquery",
100101
}
101102
});
102103

103-
// Defer enhancement of controlgroups until all dependent widgets have completed their enhancement
104-
var enhKey = "controlgroup_enhancementDeps";
105-
106-
// Retrieve (and initialize if not present) information about completed depdencies for a given target
107-
function getEnhancementDeps( $target ) {
108-
var deps = $target.jqmData( enhKey );
109-
110-
if ( !deps ) {
111-
deps = {
112-
deferred: $.Deferred(),
113-
deps: {}
114-
};
115-
$target.jqmData( enhKey, deps );
116-
}
117-
118-
return deps;
119-
}
120-
121-
// Record that a dependency has completed and resolve the deferred when all listed dependencies are complete
122-
$( document ).bind( "enhancecomplete", function( e, data ) {
123-
var deps = [ "button", "checkboxradio", "buttonMarkup", "select" ], idx,
124-
$target = $( e.target ),
125-
enhancementDeps = getEnhancementDeps( $target );
126-
127-
enhancementDeps.deps[ data ] = true;
128-
129-
for ( idx = deps.length - 1 ; idx > -1 ; idx-- ) {
130-
if ( !enhancementDeps.deps[ deps[ idx ] ] ) {
131-
break;
132-
}
133-
}
134-
135-
if ( -1 === idx ) {
136-
enhancementDeps.deferred.resolve();
137-
}
138-
});
139-
140-
// Wait for dependent widgets inside e.target to become enhanced before enhancing controlgroups
141104
$( document ).bind( "pagecreate create", function( e ) {
142-
var $target = $( e.target ),
143-
enhancementDeps = getEnhancementDeps( $target );
144-
145-
enhancementDeps.deferred.done( function() {
146-
$.mobile.controlgroup.prototype.enhanceWithin( e.target, true );
147-
$target.jqmRemoveData( enhKey );
148-
});
105+
$.mobile.controlgroup.prototype.enhanceWithin( e.target, true );
149106
});
150107
})(jQuery);
151108
//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);

js/widgets/forms/button.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ $.widget( "mobile.button", $.mobile.widget, {
160160
//auto self-init widgets
161161
$( document ).bind( "pagecreate create", function( e ) {
162162
$.mobile.button.prototype.enhanceWithin( e.target, true );
163-
$( e.target ).trigger( "enhancecomplete", "button" );
164163
});
165164

166165
})( jQuery );

js/widgets/forms/checkboxradio.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ $.widget( "mobile.checkboxradio", $.mobile.checkboxradio, $.mobile.behaviors.for
211211
//auto self-init widgets
212212
$( document ).bind( "pagecreate create", function( e ) {
213213
$.mobile.checkboxradio.prototype.enhanceWithin( e.target, true );
214-
$( e.target ).trigger( "enhancecomplete", "checkboxradio" );
215214
});
216215

217216
})( jQuery );

js/widgets/forms/select.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ $.widget( "mobile.selectmenu", $.mobile.selectmenu, $.mobile.behaviors.formReset
272272
//auto self-init widgets
273273
$( document ).bind( "pagecreate create", function( e ) {
274274
$.mobile.selectmenu.prototype.enhanceWithin( e.target, true );
275-
$( e.target ).trigger( "enhancecomplete", "select" );
276275
});
277276
})( jQuery );
278277
//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);

0 commit comments

Comments
 (0)