[richfaces-svn-commits] JBoss Rich Faces SVN: r23170 - in modules/tests/metamer/trunk: application/src/main/webapp/components/richFileUpload and 1 other directories.
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/richFileUpload/list.xhtml
Log:
RF-10197: fix merge problems
Following files modifies:
modified: application/src/main/webapp/components/richFileUpload/list.xhtml (removed
MERGE CONFLICT mark)
deleted: application/src/main/webapp/resources/script/push.js (this file was renamed
to pushHelper.js)
deleted: notes (no longer needed)
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/list.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/list.xhtml 2012-01-22
22:30:29 UTC (rev 23169)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/list.xhtml 2012-01-23
09:09:32 UTC (rev 23170)
@@ -34,14 +34,11 @@
<metamer:testPageLink id="simple" outcome="simple"
value="Simple">
Simple page containing <b>rich:fileUpload</b> and inputs for
all its attributes.
</metamer:testPageLink>
-<<<<<<< HEAD
<metamer:testPageLink id="rf-11825" outcome="rf-11825"
value="RF-11825">
Simple page containing composite component containing
<b>rich:fileUpload</b>
to demonstrate <a
href="https://issues.jboss.org/browse/RF-11825">RF-11825<...
</metamer:testPageLink>
-=======
->>>>>>> feature/contextMenu
</ui:define>
Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/script/push.js
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/resources/script/push.js 2012-01-22
22:30:29 UTC (rev 23169)
+++
modules/tests/metamer/trunk/application/src/main/webapp/resources/script/push.js 2012-01-23
09:09:32 UTC (rev 23170)
@@ -1,6 +0,0 @@
-function updateList(data) {
- author = '<span style="font-weight:bold"
class="author">' + data.author + '</span>: ';
- message = '<span class="message">' + data.text +
'</span>';
- timestamp = ' <span>[' + data.timestamp + ']</span>';
- jQuery("ul.push-list").append('<li>' + author + message +
timestamp + '</li>');
-}
Deleted: modules/tests/metamer/trunk/notes
===================================================================
--- 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, you 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="script" name="picturesUtils.js"/>