Permalink
Browse files

Merge branch '1.4.0' into 1.4.0-features

  • Loading branch information...
2 parents 57ce709 + 7b942d4 commit a2a6b91f740e0c850bc8d96a10f5b75ed20334f8 @integry committed Oct 24, 2011
Showing with 9 additions and 6 deletions.
  1. +2 −2 public/javascript/backend/Backend.js
  2. +7 −4 public/javascript/backend/Product.js
View
4 public/javascript/backend/Backend.js
@@ -1678,11 +1678,11 @@ Backend.SelectPopup.prototype = {
}
},
- getSelectedObject: function(objectID, downloadable)
+ getSelectedObject: function(objectID, downloadable, indicator)
{
this.objectID = objectID;
this.downloadable = downloadable;
- this.onObjectSelect.call(this, objectID, downloadable);
+ this.onObjectSelect.call(this, objectID, downloadable, indicator);
}
}
View
11 public/javascript/backend/Product.js
@@ -173,25 +173,28 @@ Backend.Product =
{
if ($('productIndicator_' + id))
{
- Element.show($('productIndicator_' + id));
+ var indicator = $('productIndicator_' + id);
}
else if (e)
{
var indicator = Event.element(e).parentNode.down('.progressIndicator');
if (indicator)
{
- indicator.show();
-
// ugly hack
setTimeout(function() { indicator.hide() }, 5000);
}
}
+ if (indicator)
+ {
+ Element.show(indicator);
+ }
+
if (window.opener && window.opener.selectProductPopup)
{
var downloadable = parseInt(e.target.up('tr').down(".cell_hiddenType").innerHTML) == 1;
- window.opener.selectProductPopup.getSelectedObject(id, downloadable);
+ window.opener.selectProductPopup.getSelectedObject(id, downloadable, indicator);
}
else
{

0 comments on commit a2a6b91

Please sign in to comment.