Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Various bug fixes for Base, Dialog, and Indicator

  • Loading branch information...
commit 9c51fb296d1d509ad5da50963fc36bfa4279e088 1 parent 7750564
Winton Welsh authored
Showing with 7 additions and 5 deletions.
  1. +1 −0  Base.js
  2. +4 −4 Dialog.js
  3. +2 −1  Indicator.js
View
1  Base.js
@@ -84,6 +84,7 @@ var Base = new Class({
},
loadElements: function(group) {
+ delete this.el[group + '_filter'];
for (name in this.elements[group])
this.loadElement(name, group);
},
View
8 Dialog.js
@@ -201,14 +201,14 @@ var Dialog = Base.extend({
var dialog = this.el.dialog_template.render(data);
dialog.id = this.elements.container.dialog.substring(1);
- var old = $(dialog.id);
- if (old) old.remove();
-
if (this.el.dialog) {
this.el.dialog.replaceWith(dialog);
if (this.options.centered) this.el.dialog.center();
- } else
+ } else {
+ var old = $(dialog.id);
+ if (old) old.remove();
dialog.injectInside(this.el.inside || document.body);
+ }
this.loadElements('container');
this.loadElements('dialog');
View
3  Indicator.js
@@ -12,6 +12,7 @@ var Indicator = new Class({
this.container.setHTML('<img src="/images/' + image + '" />');
this.container.setStyles({ position: 'absolute', opacity: 0, 'z-index': 5000 });
this.container.injectInside(document.body);
+ this.container.hide();
$(document.body).addEvent('mousemove', function(e) {
this.container.setStyles({
@@ -21,5 +22,5 @@ var Indicator = new Class({
}.bindWithEvent(this));
},
show: function() { this.container.fadeIn(500); },
- hide: function() { this.container.fadeOut(500); }
+ hide: function() { this.container.fadeOut(500); this.container.hide(); }
});
Please sign in to comment.
Something went wrong with that request. Please try again.