Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 10951 invoked from network); 7 Jan 2010 03:29:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Jan 2010 03:29:35 -0000 Received: (qmail 69731 invoked by uid 500); 7 Jan 2010 03:29:35 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 69558 invoked by uid 500); 7 Jan 2010 03:29:35 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 69548 invoked by uid 99); 7 Jan 2010 03:29:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2010 03:29:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2010 03:29:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 45679238899B; Thu, 7 Jan 2010 03:29:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r896747 - in /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp: WEB-INF/jetui/yui/jetui.jsp javascript/jetspeed/jetui/jetui-portal.js jetui/engine/portal.js Date: Thu, 07 Jan 2010 03:28:41 -0000 To: jetspeed-dev@portals.apache.org From: taylor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100107032904.45679238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: taylor Date: Thu Jan 7 03:28:02 2010 New Revision: 896747 URL: http://svn.apache.org/viewvc?rev=896747&view=rev Log: JS2-1084 bug fix: safe guard against different action button markup Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=896747&r1=896746&r2=896747&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp (original) +++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp Thu Jan 7 03:28:02 2010 @@ -111,20 +111,12 @@ }; // ({classNamePrefix: 'jet'}) - <%=jetui.includeHeaderResources(rc)%> - <% -// define layout objects (preferedLocale, rootFragment, site, theme, layoutDecorator) -// decorator macros -// defineNavigationConstants() - for (String style : jetui.getStyleSheets(rc)) {%> -<%} -%> - +<%}%>
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js?rev=896747&r1=896746&r2=896747&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js (original) +++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/javascript/jetspeed/jetui/jetui-portal.js Thu Jan 7 03:28:02 2010 @@ -332,12 +332,15 @@ action.setAttribute("title", "attach"); action.setAttribute("class", "portlet-action-attach"); var imgid = actionId.replace(/^jetspeed-detach-/, "jetspeed-detach-img-"); - var img = Y.one("[id='" + imgid + "']");; - var imgsrc = img.getAttribute("src"); - if (imgsrc != null) { - var s = imgsrc.replace("detach", "attach"); - img.setAttribute("src", s); - img.setAttribute("alt", "Attach"); + var img = Y.one("[id='" + imgid + "']"); + if (!Y.Lang.isNull(img)) + { + var imgsrc = img.getAttribute("src"); + if (imgsrc != null) { + var s = imgsrc.replace("detach", "attach"); + img.setAttribute("src", s); + img.setAttribute("alt", "Attach"); + } } } var uri = portal.portalContextPath + "/services/pagelayout/fragment/" + windowId + "/pos/?_type=json"; @@ -389,11 +392,14 @@ action.setAttribute("class", "portlet-action-detach"); var imgid = actionId.replace(/^jetspeed-detach-/, "jetspeed-detach-img-"); var img = Y.one("[id='" + imgid + "']");; - var imgsrc = img.getAttribute("src"); - if (imgsrc != null) { - var s = imgsrc.replace("attach", "detach"); - img.setAttribute("src", s); - img.setAttribute("alt", "Detach"); + if (!Y.Lang.isNull(img)) + { + var imgsrc = img.getAttribute("src"); + if (imgsrc != null) { + var s = imgsrc.replace("attach", "detach"); + img.setAttribute("src", s); + img.setAttribute("alt", "Detach"); + } } } var drag = Y.DD.DDM.getDrag(window); Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=896747&r1=896746&r2=896747&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js (original) +++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js Thu Jan 7 03:28:02 2010 @@ -80,19 +80,22 @@ dragGroups = ['detached'], dragMode = 'point'; dropGroups = []; - } - var ddNav = new Y.DD.Drag({ - node: v, - groups: dragGroups, - dragMode: dragMode - }).plug(Y.Plugin.DDProxy, { - moveOnEnd: false - }); - ddNav.addHandle(config.dragHandleStyle); - var drop = new Y.DD.Drop({ - node: v, - groups: dropGroups - }); + } + if (portlet.get("tool") == false) + { + var ddNav = new Y.DD.Drag({ + node: v, + groups: dragGroups, + dragMode: dragMode + }).plug(Y.Plugin.DDProxy, { + moveOnEnd: false + }); + ddNav.addHandle(config.dragHandleStyle); + var drop = new Y.DD.Drop({ + node: v, + groups: dropGroups + }); + } //portlet.info(); } }); --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org