Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
2  framework
@@ -1 +1 @@
-Subproject commit ee4744a539dd0c5424f34395790134beba6071f2
+Subproject commit fd01b9e417661051e132c008515514919c1fe5cf
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
{

No commit comments for this range

Something went wrong with that request. Please try again.