incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [1/2] git commit: Notifications widget: support custom interval
Date Tue, 24 Jul 2012 22:31:03 GMT
Updated Branches:
  refs/heads/master 003c62583 -> d7d9b341c
  refs/heads/vpc 8683fc4e0 -> e626291a3


Notifications widget: support custom interval

If 'interval' attribute is passed in notification object, use that
interval instead of the default.

Conflicts:
	ui/scripts/ui/widgets/notifications.js


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e626291a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e626291a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e626291a

Branch: refs/heads/vpc
Commit: e626291a3481bdcf57e2c7d771c58faf59d4746b
Parents: 8683fc4
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Jul 24 14:02:46 2012 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Jul 24 15:30:57 2012 -0700

----------------------------------------------------------------------
 ui/scripts/ui/widgets/notifications.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e626291a/ui/scripts/ui/widgets/notifications.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/notifications.js b/ui/scripts/ui/widgets/notifications.js
index 5ab5fcc..007e405 100644
--- a/ui/scripts/ui/widgets/notifications.js
+++ b/ui/scripts/ui/widgets/notifications.js
@@ -280,7 +280,7 @@
         cloudStack.ui.event.call('addNotification', {
           section: notification.section,
           desc: notification.desc,
-          interval: cloudStack.debug ? 0 : 5000,
+          interval: notification.interval ? notification.interval : 5000,
           _custom: notification._custom,
           poll: function(args) {
             var complete = args.complete;


Mime
View raw message