Return-Path: 
 <cloudstack-commits-return-5211-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CC887D6D8
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Mon, 22 Oct 2012 19:18:02 +0000 (UTC)
Received: (qmail 86424 invoked by uid 500); 22 Oct 2012 19:18:02 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 86394 invoked by uid 500); 22 Oct 2012 19:18:02 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 86387 invoked by uid 99); 22 Oct 2012 19:18:02 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2012 19:18:02 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 7664345D07; Mon, 22 Oct 2012 19:18:02 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bfederle@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: UI Quick view: don't render for function-based detail
 view
Message-Id: <20121022191802.7664345D07@tyr.zones.apache.org>
Date: Mon, 22 Oct 2012 19:18:02 +0000 (UTC)

Updated Branches:
  refs/heads/master d5607bc56 -> d3040de21


UI Quick view: don't render for function-based detail view

Disables quick view if detail view is returned via a closure, as it
breaks the quick view in this case.


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

Branch: refs/heads/master
Commit: d3040de21de7b039ada843a479dc402048ce04f5
Parents: d5607bc
Author: Brian Federle <brian.federle@citrix.com>
Authored: Mon Oct 22 12:12:19 2012 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Mon Oct 22 12:17:55 2012 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d3040de2/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index cd8e784..02c69f7 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -652,7 +652,9 @@
     }
 
     // Quick view
-    if (detailView && !detailView.noCompact && !uiCustom) {
+    if (detailView &&
+        !$.isFunction(detailView) &&
+        !detailView.noCompact && !uiCustom) {
       $thead.find('tr').append(
         $('<th></th>')
           .html(_l('label.quickview'))
@@ -1031,7 +1033,10 @@
       }
 
       // Add quick view
-      if (detailView && !detailView.noCompact && !uiCustom) {
+      if (detailView &&
+          !$.isFunction(detailView) &&
+          !detailView.noCompact &&
+          !uiCustom) {
         $quickView = $('<td>').addClass('quick-view reduced-hide')
           .append(
             $('<span>').addClass('icon').html('&nbsp;')