Skip to content

Commit

Permalink
Merge pull request tidev#3591 from euforic/timob-11558_3_0_X
Browse files Browse the repository at this point in the history
[TIMOB-11558](3_0_x) MobileWeb: Hiding activity indicator doesn't hide the root DIV
  • Loading branch information
Bryan Hughes authored and quahada committed May 19, 2013
2 parents 2e7a9e3 + f8ff61b commit 72ee835
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions mobileweb/titanium/Ti/UI/ActivityIndicator.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ define(['Ti/_/declare', 'Ti/_/lang', 'Ti/_/UI/Widget', 'Ti/_/dom', 'Ti/_/style',
height: UI.SIZE
});
this._add(contentContainer);

Widget.prototype.hide.call(this);

contentContainer._add(this._indicatorIndicator = UI.createView());
Expand Down Expand Up @@ -65,13 +64,19 @@ define(['Ti/_/declare', 'Ti/_/lang', 'Ti/_/UI/Widget', 'Ti/_/dom', 'Ti/_/style',
},

show: function() {
Widget.prototype.show.call(this);
this._timer = setInterval(lang.hitch(this, '_animate'), 100);
if (!this._visible) {
Widget.prototype.show.call(this);
this._timer = setInterval(lang.hitch(this, "_animate"), 100);
this._visible = 1;
}
},

hide: function() {
clearTimeout(this._timer);
Widget.prototype.hide.call(this);
if (this._visible) {
Widget.prototype.hide.call(this);
this._visible = 0;
}
},

_currentProng: 0,
Expand Down

0 comments on commit 72ee835

Please sign in to comment.