Author: blabno Date: 2011-04-20 09:29:05 -0400 (Wed, 20 Apr 2011) New Revision: 22433 Added: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/package-info.java sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/close.png sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/notify.ecss Removed: sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/notify.taglib.xml sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/notify.ecss Modified: sandbox/trunk/ui/notify/bom/pom.xml sandbox/trunk/ui/notify/demo/pom.xml sandbox/trunk/ui/notify/demo/src/main/webapp/notify.xhtml sandbox/trunk/ui/notify/demo/src/main/webapp/notify_1.xhtml sandbox/trunk/ui/notify/demo/src/main/webapp/notify_2.xhtml sandbox/trunk/ui/notify/parent/pom.xml sandbox/trunk/ui/notify/pom.xml sandbox/trunk/ui/notify/ui/pom.xml sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotify.java sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotifyMessages.java sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotifyStack.java sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/NotifyAttributes.java sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyMessagesRenderer.java sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyStackRenderer.java sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/jquery.pnotify.js sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/richfaces.notify.js Log: Updated notify to 4.1-SNAPSHOT. Modified: sandbox/trunk/ui/notify/bom/pom.xml =================================================================== --- sandbox/trunk/ui/notify/bom/pom.xml 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/bom/pom.xml 2011-04-20 13:29:05 UTC (rev 22433) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- JBoss, Home of Professional Open Source Copyright , Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a @@ -26,39 +25,37 @@ <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> - </parent> - - <groupId>org.richfaces.ui.notify</groupId> - <artifactId>richfaces-ui-notify-bom</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces.sandbox.ui.notify</groupId> + <artifactId>notify-bom</artifactId> + <version>4.1.0-SNAPSHOT</version> <name>Richfaces UI Components: notify bom</name> <packaging>pom</packaging> - <properties> - <org.richfaces.version>4.0.0-SNAPSHOT</org.richfaces.version> - </properties> - <dependencyManagement> <dependencies> <dependency> <groupId>org.richfaces</groupId> <artifactId>richfaces-bom</artifactId> - <version>${org.richfaces.version}</version> + <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>richfaces-ui-notify-ui</artifactId> + <artifactId>notify-ui</artifactId> <version>${project.version}</version> </dependency> </dependencies> </dependencyManagement> + <distributionManagement> + <snapshotRepository> + <id>bernard.labno.pl</id> + <name>MyCo Internal Repository</name> + <url>http://bernard.labno.pl/artifactory/libs-snapshot-local</url> + </snapshotRepository> + </distributionManagement> + </project> Modified: sandbox/trunk/ui/notify/demo/pom.xml =================================================================== --- sandbox/trunk/ui/notify/demo/pom.xml 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/demo/pom.xml 2011-04-20 13:29:05 UTC (rev 22433) @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui.notify</groupId> - <artifactId>richfaces-ui-notify-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces.sandbox.ui.notify</groupId> + <artifactId>notify-parent</artifactId> + <version>4.1.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui.notify</groupId> <artifactId>notify-demo</artifactId> - <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: notify demo</name> <packaging>war</packaging> <build> @@ -29,38 +26,36 @@ </plugins> </build> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.ui.notify</groupId> - <artifactId>richfaces-ui-notify-bom</artifactId> - <version>${version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-ui</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces.ui.notify</groupId> - <artifactId>richfaces-ui-notify-ui</artifactId> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + <version>${project.version}</version> </dependency> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> + <groupId>org.richfaces.sandbox.ui.notify</groupId> + <artifactId>notify-ui</artifactId> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>compile</scope> </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.sun.el</groupId> + <artifactId>el-ri</artifactId> + <version>1.0</version> + </dependency> </dependencies> </project> Modified: sandbox/trunk/ui/notify/demo/src/main/webapp/notify.xhtml =================================================================== --- sandbox/trunk/ui/notify/demo/src/main/webapp/notify.xhtml 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/demo/src/main/webapp/notify.xhtml 2011-04-20 13:29:05 UTC (rev 22433) @@ -22,13 +22,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:notify="http://richfaces.org/notify" - > +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:a4j="http://richfaces.org/a4j" xmlns:notify="http://richfaces.org/sandbox/notify"> <h:head> <title>Notify sample</title> </h:head> @@ -52,77 +47,20 @@ <p> Here we have notify displaying all messages (not only global). - Severity is reflected in overriden style classes. - </p> + Severity is reflected in overriden style classes. </p> <h:form> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> - <notify:notify sticky="false" stayTime="5000" - title="Default stack" - text="Details of the message" - nonblockingOpacity="0"/> + <notify:notify sticky="false" stayTime="5000" title="Default stack" text="Details of the message" nonblockingOpacity="0"/> - <notify:notify title="Before stack definition" - text="This message is defined in code before stack" + <notify:notify title="Before stack definition" text="This message is defined in code before stack" stack="bottomLeftStack"/> + <notify:notify title="Left bottom stack 2" text="This message alos should be displayed in the left bottom corner" showCloseButton="true" stack="bottomLeftStack"/> - <notify:notify title="Left bottom stack 2" - text="This message alos should be displayed in the left bottom corner" - showCloseButton="true" stack="bottomLeftStack"/> - <notify:notifyStack id="bottomLeftStack" styleClass="bottomLeft" stackDir1="up" - stackDir2="right" push="top"> - <notify:notify sticky="true" - title="Left bottom stack" - text="This message should be displayed in the left bottom corner - and should stay until you close it" - showCloseButton="true"/> - <notify:notify title="Nonblocking" - nonblocking="true"/> + <notify:notifyStack id="bottomLeftStack" styleClass="bottomLeft" stackDir1="up" stackDir2="right" push="top"> + <notify:notify sticky="true" title="Left bottom stack" text="This message should be displayed in the left bottom corner + and should stay until you close it" showCloseButton="true"/> + <notify:notify title="Nonblocking" nonblocking="true"/> </notify:notifyStack> <notify:notifyMessages interval="1000" stack="bottomRightStack" ajaxRendered="true"/> - <notify:notifyStack id="bottomRightStack" styleClass="bottomRight" stackDir1="up" - stackDir2="left" push="bottom"/> + <notify:notifyStack id="bottomRightStack" styleClass="bottomRight" stackDir1="up" stackDir2="left" push="bottom"/> Leave this blank for error: <br/> <h:outputLabel for="greeting" value="Greeting"/> Modified: sandbox/trunk/ui/notify/demo/src/main/webapp/notify_1.xhtml =================================================================== --- sandbox/trunk/ui/notify/demo/src/main/webapp/notify_1.xhtml 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/demo/src/main/webapp/notify_1.xhtml 2011-04-20 13:29:05 UTC (rev 22433) @@ -22,12 +22,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:notify="http://richfaces.org/notify"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:a4j="http://richfaces.org/a4j" xmlns:notify="http://richfaces.org/sandbox/notify"> <h:head> <title>Notify sample</title> <style type="text/css"> @@ -84,47 +80,19 @@ <ui:include src="menu.xhtml"/> <h:form> <a4j:outputPanel ajaxRendered="true"> - <notify:notifyStack id="customStack" - stackDir1="#{greeter.stackDir1}" - stackDir2="#{greeter.stackDir2}" - push="#{greeter.stackPush}" - styleClass="#{greeter.stackStyleClass}" - /> - <notify:notify title="#{greeter.title}" - text="#{greeter.text}" - nonblocking="#{greeter.nonblocking}" - showShadow="#{greeter.showShadow}" - showHistory="#{greeter.showHistory}" - showCloseButton="#{greeter.showCloseButton}" - sticky="#{greeter.sticky}" - stayTime="#{greeter.stayTime}" - appearAnimation="#{greeter.appearAnimation}" - hideAnimation="#{greeter.hideAnimation}" - animationSpeed="#{greeter.animationSpeed}" - nonblockingOpacity="#{greeter.nonblockingOpacity}" - styleClass="#{greeter.styleClass}" - stackDir1="#{greeter.stackDir1}" - stackDir2="#{greeter.stackDir2}" - stackPush="#{greeter.stackPush}" - stack="customStack" - /> + <notify:notifyStack id="customStack" stackDir1="#{greeter.stackDir1}" stackDir2="#{greeter.stackDir2}" push="#{greeter.stackPush}" + styleClass="#{greeter.stackStyleClass}"/> + <notify:notify title="#{greeter.title}" text="#{greeter.text}" nonblocking="#{greeter.nonblocking}" showShadow="#{greeter.showShadow}" + showHistory="#{greeter.showHistory}" showCloseButton="#{greeter.showCloseButton}" sticky="#{greeter.sticky}" + stayTime="#{greeter.stayTime}" appearAnimation="#{greeter.appearAnimation}" hideAnimation="#{greeter.hideAnimation}" + animationSpeed="#{greeter.animationSpeed}" nonblockingOpacity="#{greeter.nonblockingOpacity}" styleClass="#{greeter.styleClass}" + stackDir1="#{greeter.stackDir1}" stackDir2="#{greeter.stackDir2}" stackPush="#{greeter.stackPush}" stack="customStack"/> </a4j:outputPanel> - <notify:notifyMessages interval="#{greeter.interval}" - nonblocking="#{greeter.nonblocking}" - showShadow="#{greeter.showShadow}" - showHistory="#{greeter.showHistory}" - showCloseButton="#{greeter.showCloseButton}" - sticky="#{greeter.sticky}" - stayTime="#{greeter.stayTime}" - appearAnimation="#{greeter.appearAnimation}" - hideAnimation="#{greeter.hideAnimation}" - animationSpeed="#{greeter.animationSpeed}" - nonblockingOpacity="#{greeter.nonblockingOpacity}" - styleClass="#{greeter.styleClass}" - stackDir1="#{greeter.stackDir1}" - stackDir2="#{greeter.stackDir2}" - stackPush="#{greeter.stackPush}" - stack="customStack"/> + <notify:notifyMessages interval="#{greeter.interval}" nonblocking="#{greeter.nonblocking}" showShadow="#{greeter.showShadow}" + showHistory="#{greeter.showHistory}" showCloseButton="#{greeter.showCloseButton}" sticky="#{greeter.sticky}" + stayTime="#{greeter.stayTime}" appearAnimation="#{greeter.appearAnimation}" hideAnimation="#{greeter.hideAnimation}" + animationSpeed="#{greeter.animationSpeed}" nonblockingOpacity="#{greeter.nonblockingOpacity}" styleClass="#{greeter.styleClass}" + stackDir1="#{greeter.stackDir1}" stackDir2="#{greeter.stackDir2}" stackPush="#{greeter.stackPush}" stack="customStack"/> <a4j:commandButton value="Say Hello" action="#{greeter.sayHello}" execute="@form"/> <a4j:commandButton value="Warn me" action="#{greeter.warnMe}" execute="@form"/> <a4j:commandButton value="Say error" action="#{greeter.sayError}" execute="@form"/> Modified: sandbox/trunk/ui/notify/demo/src/main/webapp/notify_2.xhtml =================================================================== --- sandbox/trunk/ui/notify/demo/src/main/webapp/notify_2.xhtml 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/demo/src/main/webapp/notify_2.xhtml 2011-04-20 13:29:05 UTC (rev 22433) @@ -22,11 +22,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:notify="http://richfaces.org/notify"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:notify="http://richfaces.org/sandbox/notify"> <h:head> <title>Notify sample</title> <style type="text/css"> @@ -52,20 +49,9 @@ <ui:include src="menu.xhtml"/> <p> - Skinning. Icon, skining by message type. - </p> - <notify:notify title="You've got mail" - nonblocking="#{greeter.nonblocking}" - sticky="true" - styleClass="mail" - /> - <notify:notify title="You've got more mail (hides in 3sec)" - nonblocking="true" - sticky="false" - styleClass="mail" - delay="3000" - stayTime="3000" - /> + Skinning. Icon, skining by message type. </p> + <notify:notify title="You've got mail" nonblocking="#{greeter.nonblocking}" sticky="true" styleClass="mail"/> + <notify:notify title="You've got more mail (hides in 3sec)" nonblocking="true" sticky="false" styleClass="mail" delay="3000" stayTime="3000"/> <!-- TODO uncomment this once rich:insert is implemented <rich:insert src="/notify_2.xhtml" highlight="xhtml" rendered="#{showSource!=false}"/> Modified: sandbox/trunk/ui/notify/parent/pom.xml =================================================================== --- sandbox/trunk/ui/notify/parent/pom.xml 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/parent/pom.xml 2011-04-20 13:29:05 UTC (rev 22433) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- JBoss, Home of Professional Open Source Copyright , Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a @@ -28,31 +27,29 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <artifactId>richfaces-root-parent</artifactId> + <version>4.1.0-SNAPSHOT</version> </parent> - <groupId>org.richfaces.ui.notify</groupId> - <artifactId>richfaces-ui-notify-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces.sandbox.ui.notify</groupId> + <artifactId>notify-parent</artifactId> <name>Richfaces UI Components: notify parent</name> <packaging>pom</packaging> <properties> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> + <org.richfaces.cdk.version>4.1.0-SNAPSHOT</org.richfaces.cdk.version> </properties> <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui.notify</groupId> - <artifactId>richfaces-ui-notify-bom</artifactId> + <groupId>org.richfaces.sandbox.ui.notify</groupId> + <artifactId>notify-bom</artifactId> <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> - <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> @@ -86,98 +83,24 @@ <version>2.0-alpha-4</version> <extensions>true</extensions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-beta-1</version> + <configuration> + <fail>false</fail> + </configuration> + </plugin> </plugins> </pluginManagement> - - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-build-checkstyle</artifactId> - <version>${richfaces.checkstyle.version}</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <configuration> - <fail>false</fail> - </configuration> - </plugin> - - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <uri>http://richfaces.org/notify</uri> - <shortName>notify</shortName> - <displayName>notify components tags</displayName> - </taglib> - </library> - </configuration> - <executions> - <execution> - <id>cdk-generate-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> - <profiles> - <profile> - <id>release</id> + <distributionManagement> + <snapshotRepository> + <id>bernard.labno.pl</id> + <name>MyCo Internal Repository</name> + <url>http://bernard.labno.pl/artifactory/libs-snapshot-local</url> + </snapshotRepository> + </distributionManagement> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <javadocVersion>1.5</javadocVersion> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-javadoc</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-source</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> Modified: sandbox/trunk/ui/notify/pom.xml =================================================================== --- sandbox/trunk/ui/notify/pom.xml 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/pom.xml 2011-04-20 13:29:05 UTC (rev 22433) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- +<?xml version="1.0" encoding="UTF-8"?><!-- JBoss, Home of Professional Open Source Copyright , Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a @@ -26,14 +25,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> + <groupId>org.richfaces.sandbox.ui.notify</groupId> + <artifactId>notify-parent</artifactId> + <version>4.1.0-SNAPSHOT</version> + <relativePath>parent/pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui.notify</groupId> <artifactId>notify-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Richfaces UI Components: notify Aggregator</name> @@ -44,37 +42,39 @@ <module>demo</module> </modules> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <!-- The dist requires clean install for prepare --> - <preparationGoals>clean install</preparationGoals> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <!-- The dist requires clean install for prepare --> - <preparationGoals>clean install</preparationGoals> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <configuration> - <fail>false</fail> - </configuration> - </plugin> - </plugins> - </build> + <profiles> + <profile> + <id>cli</id> + <build> + <plugins> + <plugin> + <groupId>org.twdata.maven</groupId> + <artifactId>maven-cli-plugin</artifactId> + <version>1.0.6-SNAPSHOT</version> + <configuration> + <userAliases> + <ui>notify-ui clean install</ui> + <demo>notify-demo clean package</demo> + </userAliases> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> -</project> \ No newline at end of file + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/sandbox/tr... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/sand... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> + + <distributionManagement> + <snapshotRepository> + <id>bernard.labno.pl</id> + <name>MyCo Internal Repository</name> + <url>http://bernard.labno.pl/artifactory/libs-snapshot-local</url> + </snapshotRepository> + </distributionManagement> + +</project> Modified: sandbox/trunk/ui/notify/ui/pom.xml =================================================================== --- sandbox/trunk/ui/notify/ui/pom.xml 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/pom.xml 2011-04-20 13:29:05 UTC (rev 22433) @@ -28,146 +28,44 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui.notify</groupId> - <artifactId>richfaces-ui-notify-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces.sandbox.ui.notify</groupId> + <artifactId>notify-parent</artifactId> + <version>4.1.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - - <groupId>org.richfaces.ui.notify</groupId> - <artifactId>richfaces-ui-notify-ui</artifactId> + <artifactId>notify-ui</artifactId> <name>Richfaces UI Components: notify ui</name> - <packaging>jar</packaging> <dependencies> <dependency> <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> - </dependency> - - <!-- JSF with dependencies --> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - - <!-- tests --> - <dependency> <groupId>org.jboss.test-jsf</groupId> <artifactId>jsf-test-stage</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>${org.richfaces.cdk.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0-beta-2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.0-alpha-4</version> - <extensions>true</extensions> - </plugin> - </plugins> - </pluginManagement> - <plugins> <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-build-checkstyle</artifactId> - <version>${richfaces.checkstyle.version}</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <configuration> - <fail>false</fail> - </configuration> - </plugin> - - <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <uri>http://richfaces.org/notify</uri> - <shortName>notify</shortName> - <displayName>notify components tags</displayName> - </taglib> - </library> - </configuration> + <version>${org.richfaces.cdk.version}</version> <executions> <execution> <id>cdk-generate-sources</id> @@ -181,48 +79,4 @@ </plugins> </build> - <profiles> - <profile> - <id>release</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <javadocVersion>1.5</javadocVersion> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-javadoc</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-source</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> Modified: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotify.java =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotify.java 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotify.java 2011-04-20 13:29:05 UTC (rev 22433) @@ -24,26 +24,33 @@ import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; import org.richfaces.cdk.annotations.TagType; +import org.richfaces.renderkit.html.NotifyRenderer; import javax.faces.component.UIComponentBase; -@JsfComponent(tag = @Tag(name = "notify", type = TagType.Facelets)) +@JsfComponent(tag = @Tag(name = "notify", type = TagType.Facelets), + renderer = @JsfRenderer(family = AbstractNotify.COMPONENT_FAMILY, type = NotifyRenderer.RENDERER_TYPE)) public abstract class AbstractNotify extends UIComponentBase implements NotifyAttributes { +// ------------------------------ FIELDS ------------------------------ - public static final String COMPONENT_TYPE = "org.richfaces.Notify"; public static final String COMPONENT_FAMILY = "org.richfaces.Notify"; + public static final String COMPONENT_TYPE = "org.richfaces.Notify"; + public static final double DEFAULT_NONBLOCKING_OPACITY = .2; +// -------------------------- OTHER METHODS -------------------------- + @Attribute + public abstract String getText(); + + @Attribute public abstract String getTitle(); + public abstract void setText(String text); + public abstract void setTitle(String summary); - - @Attribute - public abstract String getText(); - - public abstract void setText(String test); } Modified: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotifyMessages.java =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotifyMessages.java 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotifyMessages.java 2011-04-20 13:29:05 UTC (rev 22433) @@ -25,20 +25,36 @@ import org.ajax4jsf.component.AjaxOutput; import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; import org.richfaces.cdk.annotations.TagType; +import org.richfaces.renderkit.html.NotifyMessagesRenderer; import javax.faces.component.UIMessages; -@JsfComponent(tag = @Tag(name = "notifyMessages", type = TagType.Facelets)) +@JsfComponent(tag = @Tag(name = "notifyMessages", type = TagType.Facelets), + renderer = @JsfRenderer(family = AbstractNotifyMessages.COMPONENT_FAMILY, type = NotifyMessagesRenderer.RENDERER_TYPE), + attributes = {"ajax-props.xml"}) public abstract class AbstractNotifyMessages extends UIMessages implements AjaxOutput, NotifyAttributes { +// ------------------------------ FIELDS ------------------------------ - public static final String COMPONENT_TYPE = "org.richfaces.NotifyMessages"; public static final String COMPONENT_FAMILY = "org.richfaces.Notify"; - @Attribute - public abstract Integer getInterval(); + public static final String COMPONENT_TYPE = "org.richfaces.NotifyMessages"; +// ------------------------ INTERFACE METHODS ------------------------ + + +// --------------------- Interface AjaxOutput --------------------- + @Attribute(defaultValue = "true") public abstract boolean isAjaxRendered(); + + @Attribute + public abstract boolean isKeepTransient(); + +// -------------------------- OTHER METHODS -------------------------- + + @Attribute + public abstract Integer getInterval(); } Modified: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotifyStack.java =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotifyStack.java 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/AbstractNotifyStack.java 2011-04-20 13:29:05 UTC (rev 22433) @@ -24,25 +24,33 @@ import org.richfaces.cdk.annotations.Attribute; import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; import org.richfaces.cdk.annotations.TagType; +import org.richfaces.renderkit.html.NotifyStackRenderer; import javax.faces.component.UIComponentBase; -@JsfComponent(tag = @Tag(name = "notifyStack", type = TagType.Facelets)) +@JsfComponent(tag = @Tag(name = "notifyStack", type = TagType.Facelets), + renderer = @JsfRenderer(family = AbstractNotifyStack.COMPONENT_FAMILY, type = NotifyStackRenderer.RENDERER_TYPE)) public abstract class AbstractNotifyStack extends UIComponentBase { +// ------------------------------ FIELDS ------------------------------ - public static final String COMPONENT_TYPE = "org.richfaces.NotifyStack"; public static final String COMPONENT_FAMILY = "org.richfaces.Notify"; + public static final String COMPONENT_TYPE = "org.richfaces.NotifyStack"; + +// -------------------------- OTHER METHODS -------------------------- + @Attribute - public abstract String getStyleClass(); + public abstract String getPush(); + @Attribute public abstract String getStackDir1(); @Attribute public abstract String getStackDir2(); @Attribute - public abstract String getPush(); + public abstract String getStyleClass(); } Modified: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/NotifyAttributes.java =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/NotifyAttributes.java 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/NotifyAttributes.java 2011-04-20 13:29:05 UTC (rev 22433) @@ -61,7 +61,7 @@ void setAnimationSpeed(Integer animationSpeed); - @Attribute + @Attribute(defaultValue = "true") boolean isShowHistory(); void setShowHistory(boolean showHistory); @@ -76,7 +76,7 @@ void setShowShadow(boolean showShadow); - @Attribute + @Attribute(defaultValue = "true") boolean isShowCloseButton(); void setShowCloseButton(boolean showCloseButton); Added: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/package-info.java =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/package-info.java (rev 0) +++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/component/package-info.java 2011-04-20 13:29:05 UTC (rev 22433) @@ -0,0 +1,3 @@ +@TagLibrary(uri = "http://richfaces.org/sandbox/notify", shortName = "notify", prefix = "notify", displayName = "Notify component tags") package org.richfaces.component; + +import org.richfaces.cdk.annotations.TagLibrary; \ No newline at end of file Modified: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyMessagesRenderer.java =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyMessagesRenderer.java 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyMessagesRenderer.java 2011-04-20 13:29:05 UTC (rev 22433) @@ -22,20 +22,19 @@ package org.richfaces.renderkit.html; -import java.io.IOException; -import java.util.Iterator; - -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractNotify; import org.richfaces.component.AbstractNotifyMessages; import org.richfaces.renderkit.HtmlConstants; import org.richfaces.renderkit.util.RendererUtils; +import javax.faces.application.FacesMessage; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.Iterator; + @JsfRenderer(family = AbstractNotifyMessages.COMPONENT_FAMILY, type = NotifyMessagesRenderer.RENDERER_TYPE) public class NotifyMessagesRenderer extends NotifyRenderer { @@ -77,7 +76,7 @@ if (messagesComponent.isShowSummary()) { notify.setTitle(msg.getSummary()); } - if (messagesComponent.isShowDetail()) { + if (messagesComponent.isShowDetail() && msg.getDetail() != null && !msg.getDetail().equals(msg.getSummary())) { notify.setText(msg.getDetail()); } String styleClass = messagesComponent.getStyleClass(); Modified: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java 2011-04-20 13:29:05 UTC (rev 22433) @@ -22,25 +22,24 @@ package org.richfaces.renderkit.html; -import java.io.IOException; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import org.ajax4jsf.javascript.JSFunction; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractNotify; +import org.richfaces.component.AbstractNotifyStack; +import org.richfaces.renderkit.HtmlConstants; +import org.richfaces.renderkit.RendererBase; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; -import org.ajax4jsf.javascript.JSFunction; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractNotify; -import org.richfaces.component.AbstractNotifyStack; -import org.richfaces.renderkit.AjaxComponentRendererBase; -import org.richfaces.renderkit.HtmlConstants; - @JsfRenderer(family = AbstractNotify.COMPONENT_FAMILY, type = NotifyRenderer.RENDERER_TYPE) @ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"), @@ -49,11 +48,15 @@ @ResourceDependency(name = "jquery.pnotify.js", target = "head"), @ResourceDependency(name = "richfaces.notify.js", target = "head"), @ResourceDependency(name = "notify.ecss", target = "head")}) -public class NotifyRenderer extends AjaxComponentRendererBase { +public class NotifyRenderer extends RendererBase { +// ------------------------------ FIELDS ------------------------------ public static final String RENDERER_TYPE = "org.richfaces.NotifyRenderer"; + private static final Map<String, Object> DEFAULTS; +// -------------------------- STATIC METHODS -------------------------- + static { Map<String, Object> defaults = new HashMap<String, Object>(); defaults.put("styleClass", ""); @@ -72,6 +75,8 @@ DEFAULTS = Collections.unmodifiableMap(defaults); } +// -------------------------- OTHER METHODS -------------------------- + @Override public void encodeEnd(FacesContext context, UIComponent component) throws IOException { if (!(component instanceof AbstractNotify)) { @@ -82,12 +87,21 @@ writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, getUtils().clientId(context, component), "type"); writer.startElement(HtmlConstants.SCRIPT_ELEM, null); writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/javascript", "type"); - writer.writeText(new JSFunction("RichFaces.Notify", getOptions(context, (AbstractNotify) component)), null); + writer.writeText(new JSFunction("RichFaces.ui.Notify", getOptions(context, (AbstractNotify) component)), null); writer.writeText(";", null); writer.endElement(HtmlConstants.SCRIPT_ELEM); writer.endElement(HtmlConstants.DIV_ELEM); } + protected void addOptionIfSetAndNotDefault(String optionName, Object value, Map<String, Object> options) { + if (value != null && !"".equals(value) + && !value.equals(DEFAULTS.get(optionName)) + && !(value instanceof Collection && ((Collection) value).size() == 0) + && !(value instanceof Map && ((Map) value).size() == 0)) { + options.put(optionName, value); + } + } + protected Map<String, Object> getOptions(FacesContext context, AbstractNotify notify) throws IOException { /** * Include only attributes that are actually set. @@ -120,20 +134,6 @@ return options; } - protected String getStackStyleClass(FacesContext context, AbstractNotify notify) { - AbstractNotifyStack stack = getStackComponent(context, notify); - return stack == null ? "" : stack.getStyleClass(); - } - - protected void addOptionIfSetAndNotDefault(String optionName, Object value, Map<String, Object> options) { - if (value != null && !"".equals(value) - && !value.equals(DEFAULTS.get(optionName)) - && !(value instanceof Collection && ((Collection) value).size() == 0) - && !(value instanceof Map && ((Map) value).size() == 0)) { - options.put(optionName, value); - } - } - protected AbstractNotifyStack getStackComponent(FacesContext context, AbstractNotify notify) { String stackId = notify.getStack(); if (stackId == null) { @@ -151,4 +151,9 @@ } } } + + protected String getStackStyleClass(FacesContext context, AbstractNotify notify) { + AbstractNotifyStack stack = getStackComponent(context, notify); + return stack == null ? "" : stack.getStyleClass(); + } } Modified: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyStackRenderer.java =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyStackRenderer.java 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyStackRenderer.java 2011-04-20 13:29:05 UTC (rev 22433) @@ -22,30 +22,29 @@ package org.richfaces.renderkit.html; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; +import org.ajax4jsf.javascript.JSFunction; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.component.AbstractNotifyStack; +import org.richfaces.renderkit.HtmlConstants; +import org.richfaces.renderkit.RendererBase; +import org.richfaces.renderkit.util.RendererUtils; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; -import org.ajax4jsf.javascript.JSFunction; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.component.AbstractNotifyStack; -import org.richfaces.renderkit.AjaxComponentRendererBase; -import org.richfaces.renderkit.HtmlConstants; -import org.richfaces.renderkit.util.RendererUtils; - @JsfRenderer(family = AbstractNotifyStack.COMPONENT_FAMILY, type = NotifyStackRenderer.RENDERER_TYPE) @ResourceDependencies({ @ResourceDependency(name = "jquery.js", target = "head"), @ResourceDependency(name = "richfaces.js", target = "head"), @ResourceDependency(name = "richfaces.notify.js", target = "head") }) -public class NotifyStackRenderer extends AjaxComponentRendererBase { +public class NotifyStackRenderer extends RendererBase { public static final String RENDERER_TYPE = "org.richfaces.NotifyStackRenderer"; @@ -56,7 +55,7 @@ } ResponseWriter writer = context.getResponseWriter(); writer.startElement(HtmlConstants.SCRIPT_ELEM, null); - writer.writeText(new JSFunction("RichFaces.NotifyStack.register", + writer.writeText(new JSFunction("RichFaces.ui.NotifyStack.register", RendererUtils.getInstance().clientId(context, component), getOptions((AbstractNotifyStack) component) ), null); Deleted: sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/notify.taglib.xml =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/notify.taglib.xml 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/notify.taglib.xml 2011-04-20 13:29:05 UTC (rev 22433) @@ -1,247 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - JBoss, Home of Professional Open Source - Copyright , Red Hat, Inc. and individual contributors - by the @authors tag. See the copyright.txt in the distribution for a - full listing of individual contributors. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd" - version="2.0" id="a4j"> - <namespace>http://richfaces.org/notify</namespace> - <tag> - <tag-name>notify</tag-name> - <component> - <component-type>org.richfaces.Notify</component-type> - <renderer-type>org.richfaces.NotifyRenderer</renderer-type> - </component> - <attribute> - <name>animationSpeed</name> - <type>java.lang.Integer</type> - </attribute> - <attribute> - <name>appearAnimation</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <name>delay</name> - <type>java.lang.Integer</type> - </attribute> - <attribute> - <name>hideAnimation</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>nonblocking</name> - <type>boolean</type> - </attribute> - <attribute> - <name>nonblockingOpacity</name> - <type>java.lang.Double</type> - </attribute> - <attribute> - <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>showCloseButton</name> - <type>boolean</type> - </attribute> - <attribute> - <name>showHistory</name> - <type>boolean</type> - </attribute> - <attribute> - <name>showShadow</name> - <type>boolean</type> - </attribute> - <attribute> - <name>stack</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>stayTime</name> - <type>java.lang.Integer</type> - </attribute> - <attribute> - <name>sticky</name> - <type>boolean</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>text</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>title</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>notifyStack</tag-name> - <component> - <component-type>org.richfaces.NotifyStack</component-type> - <renderer-type>org.richfaces.NotifyStackRenderer</renderer-type> - </component> - <attribute> - <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>push</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>stackDir2</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>notifyMessages</tag-name> - <component> - <component-type>org.richfaces.NotifyMessages</component-type> - <renderer-type>org.richfaces.NotifyMessagesRenderer</renderer-type> - </component> - <attribute> - <name>ajaxRendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>animationSpeed</name> - <type>java.lang.Integer</type> - </attribute> - <attribute> - <name>appearAnimation</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <name>delay</name> - <type>java.lang.Integer</type> - </attribute> - <attribute> - <description>Client identifier of the component for which to display messages. This attribute is mutually exclusive with globalOnly and take precedence if used.</description> - <name>for</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Flag indicating that only global messages (that is, messages not associated with any client identifier) are to be displayed. Default value is "false".</description> - <name>globalOnly</name> - <type>boolean</type> - </attribute> - <attribute> - <name>hideAnimation</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>interval</name> - <type>java.lang.Integer</type> - </attribute> - <attribute> - <name>nonblocking</name> - <type>boolean</type> - </attribute> - <attribute> - <name>nonblockingOpacity</name> - <type>java.lang.Double</type> - </attribute> - <attribute> - <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>showCloseButton</name> - <type>boolean</type> - </attribute> - <attribute> - <description>Flag indicating whether the detail portion of displayed messages should be included. Default value is "false".</description> - <name>showDetail</name> - <type>boolean</type> - </attribute> - <attribute> - <name>showHistory</name> - <type>boolean</type> - </attribute> - <attribute> - <name>showShadow</name> - <type>boolean</type> - </attribute> - <attribute> - <description>Flag indicating whether the summary portion of displayed messages should be included. Default value is "true".</description> - <name>showSummary</name> - <type>boolean</type> - </attribute> - <attribute> - <name>stack</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>stayTime</name> - <type>java.lang.Integer</type> - </attribute> - <attribute> - <name>sticky</name> - <type>boolean</type> - </attribute> - <attribute> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - </tag> -</facelet-taglib> Added: sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/close.png =================================================================== (Binary files differ) Property changes on: sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/close.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/jquery.pnotify.js =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/jquery.pnotify.js 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/jquery.pnotify.js 2011-04-20 13:29:05 UTC (rev 22433) @@ -1,23 +1,10 @@ /* - * JBoss, Home of Professional Open Source - * Copyright , Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. + * jQuery Pines Notify (pnotify) Plugin 1.0.1 * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. + * Copyright (c) 2009 Hunter Perrin * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * Licensed (along with all of Pines) under the GNU Affero GPL: + * http://www.gnu.org/licenses/agpl.html */ (function($) { @@ -253,13 +240,16 @@ if (opts.pnotify_mouse_reset && animating == "out") { // If it's animating out, animate back in really quick. pnotify.stop(true); + animating = "in"; pnotify.css("height", "auto").animate({"width": opts.pnotify_width, "opacity": opts.pnotify_nonblock ? opts.pnotify_nonblock_opacity : opts.pnotify_opacity}, "fast"); - } else if (opts.pnotify_nonblock && animating != "out") { + } + if (opts.pnotify_nonblock) { // If it's non-blocking, animate to the other opacity. pnotify.animate({"opacity": opts.pnotify_nonblock_opacity}, "fast"); } if (opts.pnotify_hide && opts.pnotify_mouse_reset) pnotify.pnotify_cancel_remove(); - if (opts.pnotify_closer && !opts.pnotify_nonblock) pnotify.closer.show(); + // Do not update + if (opts.pnotify_closer && !opts.pnotify_nonblock) pnotify.closer.css("visibility", "visible"); }, "mouseleave": function(e) { if (opts.pnotify_nonblock) e.stopPropagation(); @@ -268,7 +258,8 @@ if (opts.pnotify_nonblock && animating != "out") pnotify.animate({"opacity": opts.pnotify_opacity}, "fast"); if (opts.pnotify_hide && opts.pnotify_mouse_reset) pnotify.pnotify_queue_remove(); - pnotify.closer.hide(); + // Do not update + pnotify.closer.css("visibility", "hidden"); $.pnotify_position_all(); }, "mouseover": function(e) { @@ -318,7 +309,7 @@ pnotify.container = $("<div />", {"class": "rf-ny-co"}) .appendTo(pnotify); - pnotify.pnotify_version = "1.0.0"; + pnotify.pnotify_version = "1.0.1"; // This function is for updating the notice. pnotify.pnotify = function(options) { @@ -516,10 +507,11 @@ // Provide a button to close the notice. pnotify.closer = $("<div />", { "class": "rf-ny-cl", - "css": {"cursor": "pointer", "display": "none"}, + "css": {"cursor": "pointer", "visibility": "hidden"}, "click": function() { pnotify.pnotify_remove(); - pnotify.closer.hide(); + // Do not update + pnotify.closer.css("visibility", "hidden"); } }) .append($("<span />", {"class": "rf-ny-cl-ic"})) @@ -553,6 +545,9 @@ if (opts.pnotify_text === false) pnotify.text_container.hide(); + //Append div with clear:both class + $("<div />", {"class":"rf-ny-fcl"}).appendTo(pnotify.container); + // Set width and min height. if (typeof opts.pnotify_width == "string") pnotify.css("width", opts.pnotify_width); @@ -599,6 +594,7 @@ // }, "click": function() { // Display all notices. (Disregarding non-history notices.) + // Don't change it to pnotify's new version, cause using body_data here is a bug $.each(body.data("pnotify"), function() { if (this.pnotify_history && this.pnotify_display) this.pnotify_display(); Deleted: sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/notify.ecss =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/notify.ecss 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/notify.ecss 2011-04-20 13:29:05 UTC (rev 22433) @@ -1,162 +0,0 @@ -.rf-ny { - bottom : auto; - right : 10px; - top: 10px; - left: auto; - z-index: 9999; -} -.rf-ny-info { - color: '#{richSkin.generalTextColor}'; -} -.rf-ny-warn { - color:orange; -} -.rf-ny-error { - color:red; -} -.rf-ny-fatal { - color:red; - font-weight:bold; -} -html > body .rf-ny { - position: fixed; -} -.rf-ny .rf-ny-sh { - margin:0; - padding: 8px; - opcity: .3; - border-radius: 8px; - position: absolute; - z-index: -1; - top: .1em; - left: .1em; - bottom: -.2em; - right: -.2em; - background-color: '#{richSkin.headerBackgroundColor}'; - color: '#{richSkin.headerTextColor}'; - '-moz-border-radius': 8px; - '-webkit-border-radius': 8px; -} -.rf-ny-co { - height: 100%; - padding: .8em; - border-width: 1px; - border-style: solid; - border-radius: 4px; - border-color: '#{richSkin.panelBorderColor}'; - background-color: '#{richSkin.generalBackgroundColor}'; - color: '#{richSkin.panelTextColor}'; - '-moz-border-radius': 4px; - '-webkit-border-radius': 4px; -} - -.rf-ny-co-hover { - background:red; -} -.rf-ny-cl { - float: right; - margin-left: .2em; -} - -.rf-ny-cl-ic { - display: block; - width: 11px; - height: 11px; -/** -TODO uncomment this - background-image:"url(#{resource['org.richfaces.renderkit.html.images.CancelControlIcon']})"; -*/ -} - -.rf-ny-ti { - display: block; - font-size: 1.2em; - font-weight: bold; - margin-bottom: .4em; -} -.rf-ny-te { - display: block; -} -.rf-ny-ic { - display: none; - float: left; - margin-right: .2em; - width:32px; - height:32px; -} - -.rf-ny-hc { - background-color: '#{richSkin.headerBackgroundColor}'; - border-color: '#{richSkin.headerBackgroundColor}'; - font-size: '#{richSkin.headerSizeFont}'; - color: '#{richSkin.headerTextColor}'; - font-family: '#{richSkin.headerFamilyFont}'; -/** -TODO uncomment this - background-image:"url(#{resource['org.richfaces.renderkit.html.GradientA']})"; -*/ - font-weight: normal; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - position: absolute; - top: 0; - right: 18px; - width: 70px; - z-index: 10000; - color: '#{richSkin.panelTextColor}'; - '-moz-border-radius-bottomleft': 4px; - '-webkit-border-bottom-left-radius': 4px; - '-moz-border-radius-bottomright': 4px; - '-webkit-border-bottom-right-radius': 4px; -} - -.rf-ny-hc .rf-ny-hh { - padding: 2px; -} -.rf-ny-hc button { - cursor: pointer; - display: block; - width: 100%; -} -.rc-ny-ha { - border-radius: 4px; - '-moz-border-radius': 4px; - '-webkit-border-radius': 4px; -} - -.rf-ny-hc .rf-ny-hp { - display: block; - margin: 0 auto; - width: 16px; - height: 16px; - background-color: '#{richSkin.panelTextColor}'; -/** -TODO check why nullpointer is thrown because of this - background-image:"url(#{resource['org.richfaces.renderkit.html.images.TriangleIconDown']})"; -*/ -} -.rc-ny-hl { - font-weight: normal; - color: '#{richSkin.panelTextColor}'; - border-radius: 4px; - border-color: '#{richSkin.panelBorderColor}'; - background-color: '#{richSkin.generalBackgroundColor}'; - '-moz-border-radius': 4px; - '-webkit-border-radius': 4px; -} -.rf-ny-info .rf-ny-ic { - display: block; - background-image:"url(#{resource['info.png']})"; -} -.rf-ny-warn .rf-ny-ic { - display: block; - background-image:"url(#{resource['warn.png']})"; -} -.rf-ny-error .rf-ny-ic { - display: block; - background-image:"url(#{resource['error.png']})"; -} -.rf-ny-fatal .rf-ny-ic { - display: block; - background-image:"url(#{resource['fatal.png']})"; -} \ No newline at end of file Added: sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/notify.ecss =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/notify.ecss (rev 0) +++ sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/notify.ecss 2011-04-20 13:29:05 UTC (rev 22433) @@ -0,0 +1,177 @@ +.rf-ny { + bottom: auto; + right: 10px; + top: 10px; + left: auto; + z-index: 9999; +} + +.rf-ny-info { + color: '#{richSkin.generalTextColor}'; +} + +.rf-ny-warn { + color: orange; +} + +.rf-ny-error { + color: red; +} + +.rf-ny-fatal { + color: red; + font-weight: bold; +} + +html > body .rf-ny { + position: fixed; +} + +.rf-ny .rf-ny-sh { + margin: 0; + padding: 8px; + opacity: .3; + border-radius: 8px; + position: absolute; + z-index: -1; + top: .1em; + left: .1em; + bottom: -.2em; + right: -.2em; + background-color: '#{richSkin.headerBackgroundColor}'; + color: '#{richSkin.headerTextColor}'; +'-moz-border-radius' : 8 px; +'-webkit-border-radius' : 8 px; +} + +.rf-ny-co { + height: 100%; + padding: .8em; + border-width: 1px; + border-style: solid; + border-radius: 4px; + border-color: '#{richSkin.panelBorderColor}'; + background-color: '#{richSkin.generalBackgroundColor}'; + color: '#{richSkin.panelTextColor}'; +'-moz-border-radius' : 4 px; +'-webkit-border-radius' : 4 px; +} + +.rf-ny-co-hover { + background: red; +} + +.rf-ny-cl { + float: right; + margin-left: .2em; +} + +.rf-ny-cl-ic { + display: block; + width: 11px; + height: 11px; + background-image:"url(#{resource['close.png']})"; +} + +.rf-ny-ti { + display: block; + font-size: 1.2em; + font-weight: bold; + margin-bottom: .4em; +} + +.rf-ny-te { + display: block; +} + +.rf-ny-fcl{ + clear:both; +} + +.rf-ny-ic { + display: none; + float: left; + margin-right: .2em; + width: 32px; + height: 32px; +} + +.rf-ny-hc { + background-color: '#{richSkin.headerBackgroundColor}'; + border-color: '#{richSkin.headerBackgroundColor}'; + font-size: '#{richSkin.headerSizeFont}'; + color: '#{richSkin.headerTextColor}'; + font-family: '#{richSkin.headerFamilyFont}'; + /** + TODO uncomment this + background-image:"url(#{resource['org.richfaces.renderkit.html.GradientA']})"; + */ + font-weight: normal; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + position: absolute; + top: 0; + right: 18px; + width: 70px; + z-index: 10000; + color: '#{richSkin.panelTextColor}'; +'-moz-border-radius-bottomleft' : 4 px; +'-webkit-border-bottom-left-radius' : 4 px; +'-moz-border-radius-bottomright' : 4 px; +'-webkit-border-bottom-right-radius' : 4 px; +} + +.rf-ny-hc .rf-ny-hh { + padding: 2px; +} + +.rf-ny-hc button { + cursor: pointer; + display: block; + width: 100%; +} + +.rc-ny-ha { + border-radius: 4px; +'-moz-border-radius' : 4 px; +'-webkit-border-radius' : 4 px; +} + +.rf-ny-hc .rf-ny-hp { + display: block; + margin: 0 auto; + width: 16px; + height: 16px; + background-color: '#{richSkin.panelTextColor}'; + background-image:"url(#{resource['org.richfaces.images:triangleDown.png']})"; +} + +.rc-ny-hl { + font-weight: normal; + color: '#{richSkin.panelTextColor}'; + border-radius: 4px; + border-color: '#{richSkin.panelBorderColor}'; + background-color: '#{richSkin.generalBackgroundColor}'; +'-moz-border-radius' : 4 px; +'-webkit-border-radius' : 4 px; +} + +.rf-ny-info .rf-ny-ic { + display: block; + background-image: "url(#{resource['info.png']})"; +} + +.rf-ny-warn .rf-ny-ic { + display: block; + background-image: "url(#{resource['warn.png']})"; +} + +.rf-ny-error .rf-ny-ic { + display: block; + background-image: "url(#{resource['error.png']})"; +} + +.rf-ny-fatal .rf-ny-ic { + display: block; + background-image: "url(#{resource['fatal.png']})"; +} \ No newline at end of file Modified: sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/richfaces.notify.js =================================================================== --- sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/richfaces.notify.js 2011-04-19 10:33:53 UTC (rev 22432) +++ sandbox/trunk/ui/notify/ui/src/main/resources/META-INF/resources/richfaces.notify.js 2011-04-20 13:29:05 UTC (rev 22433) @@ -20,8 +20,8 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -window.RichFaces = window.RichFaces || {}; -RichFaces.NotifyStack = (function() { +RichFaces.ui = RichFaces.ui || {}; +RichFaces.ui.NotifyStack = (function() { var stacks = {}; return { register: function(id, stack) { @@ -50,7 +50,7 @@ } })(); -RichFaces.Notify = function(options) { +RichFaces.ui.Notify = function(options) { /** * Copies attributes from one objects to other object, but * can change the name of target attributes. @@ -68,7 +68,7 @@ options = jQuery.extend({stack:'default'}, options); if (options != null && typeof options.stack == "string") { - options.stack = RichFaces.NotifyStack.getStack(options.stack); + options.stack = RichFaces.ui.NotifyStack.getStack(options.stack); } var delegateOptions = extend({}, options, { 'title':'pnotify_title' , @@ -100,75 +100,4 @@ jQuery.pnotify(delegateOptions); } }); -}; - -//TODO remove this fix when it gets in to jquery.js -(function() { - var safariCompatMode; - var getCompatMode = function() { - var compatMode = document.compatMode; - if (!compatMode && jQuery.browser.safari) { - if (!safariCompatMode) { - //detect compatMode as described in http://code.google.com/p/doctype/wiki/ArticleCompatMode - var width = jQuery(document.createElement("div")).attr('style', 'position:absolute;width:0;height:0;width:1') - .css('width'); - safariCompatMode = compatMode = (width == '1px' ? 'BackCompat' : 'CSS1Compat'); - } else { - compatMode = safariCompatMode; - } - } - - return compatMode; - }; - - - // Create innerHeight, innerWidth, outerHeight and outerWidth methods - jQuery.each([ "Height", "Width" ], function(i, name) { - - var tl = i ? "Left" : "Top", // top or left - br = i ? "Right" : "Bottom", // bottom or right - lower = name.toLowerCase(); - - // innerHeight and innerWidth - jQuery.fn["inner" + name] = function() { - return this[0] ? - jQuery.css(this[0], lower, false, "padding") : - null; - }; - - // outerHeight and outerWidth - jQuery.fn["outer" + name] = function(margin) { - return this[0] ? - jQuery.css(this[0], lower, false, margin ? "margin" : "border") : - null; - }; - - var type = name.toLowerCase(); - - jQuery.fn[ type ] = function(size) { - // Get window width or height - return this[0] == window ? - // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode - getCompatMode() == "CSS1Compat" && document.documentElement[ "client" + name ] || - document.body[ "client" + name ] : - - // Get document width or height - this[0] == document ? - // Either scroll[Width/Height] or offset[Width/Height], whichever is greater - Math.max( - document.documentElement["client" + name], - document.body["scroll" + name], document.documentElement["scroll" + name], - document.body["offset" + name], document.documentElement["offset" + name] - ) : - - // Get or set width or height on the element - size === undefined ? - // Get width or height on the element - (this.length ? jQuery.css(this[0], type) : null) : - - // Set the width or height on the element (default to pixels if value is unitless) - this.css(type, typeof size === "string" ? size : size + "px"); - }; - - }); -}()); \ No newline at end of file +}; \ No newline at end of file