From richfaces-svn-commits at lists.jboss.org Mon Jan 23 04:09:34 2012
Content-Type: multipart/mixed; boundary="===============0458697582658323684=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r23170 - in
 modules/tests/metamer/trunk:
 application/src/main/webapp/components/richFileUpload and 1 other
 directories.
Date: Mon, 23 Jan 2012 04:09:33 -0500
Message-ID: <201201230909.q0N99XCL029135@svn01.web.mwc.hst.phx2.redhat.com>

--===============0458697582658323684==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jjamrich
Date: 2012-01-23 04:09:32 -0500 (Mon, 23 Jan 2012)
New Revision: 23170

Removed:
   modules/tests/metamer/trunk/application/src/main/webapp/resources/script=
/push.js
   modules/tests/metamer/trunk/notes
Modified:
   modules/tests/metamer/trunk/application/src/main/webapp/components/richF=
ileUpload/list.xhtml
Log:
RF-10197: fix merge problems

Following files modifies:
	modified:   application/src/main/webapp/components/richFileUpload/list.xht=
ml (removed MERGE CONFLICT mark)
	deleted:    application/src/main/webapp/resources/script/push.js (this fil=
e was renamed to pushHelper.js)
	deleted:    notes (no longer needed)

Modified: modules/tests/metamer/trunk/application/src/main/webapp/component=
s/richFileUpload/list.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/components/rich=
FileUpload/list.xhtml	2012-01-22 22:30:29 UTC (rev 23169)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/rich=
FileUpload/list.xhtml	2012-01-23 09:09:32 UTC (rev 23170)
@@ -34,14 +34,11 @@
             <metamer:testPageLink id=3D"simple" outcome=3D"simple" value=
=3D"Simple">
                 Simple page containing <b>rich:fileUpload</b> and inputs f=
or all its attributes.
             </metamer:testPageLink>
-<<<<<<< HEAD
             =

             <metamer:testPageLink id=3D"rf-11825" outcome=3D"rf-11825" val=
ue=3D"RF-11825">
                 Simple page containing composite component containing <b>r=
ich:fileUpload</b> =

                 to demonstrate <a href=3D"https://issues.jboss.org/browse/=
RF-11825">RF-11825</a>
             </metamer:testPageLink>
-=3D=3D=3D=3D=3D=3D=3D
->>>>>>> feature/contextMenu
 =

         </ui:define>
 =


Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/=
script/push.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/resources/scrip=
t/push.js	2012-01-22 22:30:29 UTC (rev 23169)
+++ modules/tests/metamer/trunk/application/src/main/webapp/resources/scrip=
t/push.js	2012-01-23 09:09:32 UTC (rev 23170)
@@ -1,6 +0,0 @@
-function updateList(data) {
-    author =3D '<span style=3D"font-weight:bold" class=3D"author">' + data=
.author + '</span>: ';
-    message =3D '<span class=3D"message">' + data.text + '</span>';
-    timestamp =3D ' <span>[' + data.timestamp + ']</span>';
-    jQuery("ul.push-list").append('<li>' + author + message + timestamp + =
'</li>');
-}

Deleted: modules/tests/metamer/trunk/notes
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/notes	2012-01-22 22:30:29 UTC (rev 23169)
+++ modules/tests/metamer/trunk/notes	2012-01-23 09:09:32 UTC (rev 23170)
@@ -1,22 +0,0 @@
-
-label: where should this attribute value apears
-
-showEvent: list of attacheable events (format)
-
-onmouseup: it is ok that this event is triggered before menu show? (so, yo=
u get this event everytime you click to trigger menu show)
-
-Doesn't work within following containers:
- - Rich Collapsible Sub Table
- - Rich Data Table
- - Rich Data Grid
- - Rich Exatended Data Table
- - Rich List
- - JSF Data Table
- - UI Repeat
- - A4j Repeat
-
-
-
-
-
-<h:outputScript library=3D"script" name=3D"picturesUtils.js"/>


--===============0458697582658323684==--