You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/11/26 15:37:52 UTC
svn commit: r1039385 - in /myfaces/tobago/trunk/tobago-theme:
tobago-theme-scarborough/
tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/
tobago-theme-speyside/ tobago-theme-speyside/src/m...
Author: lofwyr
Date: Fri Nov 26 14:37:52 2010
New Revision: 1039385
URL: http://svn.apache.org/viewvc?rev=1039385&view=rev
Log:
TOBAGO-943: Consolidation of the Tobago JavaScript files and css files
Added:
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago.js (contents, props changed)
- copied, changed from r1039263, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/theme-config.js
Removed:
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/theme-config.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/script/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/theme-config.js
Modified:
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-theme.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml?rev=1039385&r1=1039384&r2=1039385&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/pom.xml Fri Nov 26 14:37:52 2010
@@ -54,7 +54,7 @@
<concat destfile="${project.build.directory}/javascript-min/scarborough/script/tobago.min.js">
<filelist
dir="${basedir}/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script"
- files="theme-config.js,tobago-sheet.js"/>
+ files="tobago-sheet.js"/>
</concat>
<replaceregexp match="^;;;.*$" replace="" byline="true">
<fileset dir="${project.build.directory}/javascript-min">
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago.js (from r1039263, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/theme-config.js)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago.js?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago.js&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/theme-config.js&r1=1039263&r2=1039385&rev=1039385&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/theme-config.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago.js Fri Nov 26 14:37:52 2010
@@ -17,28 +17,8 @@
Tobago.Config.set("Tobago", "themeConfig", "scarborough/standard");
- /**
- * 2 * borderWidth of popup content div
- * TODO check correctness for different themes
- */
-Tobago.Config.set("Popup", "borderWidth", 4);
-
-/**
- * Additional top offset for toolbar button dropdown menu
- */
-Tobago.Config.set("Menu", "toolbarTopOffset", -1);
-
/**
* Width of border from sheets content div := style width * 2
*/
Tobago.Config.set("Sheet", "contentBorderWidth", 2);
-/**
- * Additional top offset for sheet selector dropdown menu
- */
- Tobago.Config.set("Menu", "SheetSelectorMenuTopOffset", -1);
-
-/**
- * Additional top offset for toolbar dropdown menu
- */
- Tobago.Config.set("Menu", "ToolBarButtonMenuTopOffset", -1);
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago.js
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml?rev=1039385&r1=1039384&r2=1039385&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/pom.xml Fri Nov 26 14:37:52 2010
@@ -142,6 +142,7 @@
</execution>
</executions>
</plugin>
+<!--
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
@@ -192,9 +193,9 @@
<arguments>
<argument>-jar</argument>
<argument>../tobago-theme-standard/lib/compiler-20100917.jar</argument>
- <argument>--js</argument>
+ <argument>--js</argument>
<argument>${project.build.directory}/javascript-min/speyside/script/tobago.min.js</argument>
- <argument>--js_output_file</argument>
+ <argument>--js_output_file</argument>
<argument>
target/classes/org/apache/myfaces/tobago/renderkit/html/speyside/standard/script/tobago.min.js
</argument>
@@ -203,6 +204,7 @@
</execution>
</executions>
</plugin>
+-->
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml?rev=1039385&r1=1039384&r2=1039385&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml Fri Nov 26 14:37:52 2010
@@ -62,7 +62,7 @@
<concat destfile="${project.build.directory}/javascript-min/standard/script/tobago.min.js">
<filelist
dir="${basedir}/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script"
- files="tobago.js,calendar.js,dateConverter.js,theme-config.js,tobago-menu.js,tobago-sheet.js,
+ files="tobago.js,calendar.js,dateConverter.js,tobago-menu.js,tobago-sheet.js,
tobago-tabgroup.js,tobago-tree.js"/>
</concat>
<concat destfile="${project.build.directory}/javascript-min/msie_6_0/script/tobago.min.js">
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-theme.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-theme.xml?rev=1039385&r1=1039384&r2=1039385&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-theme.xml Fri Nov 26 14:37:52 2010
@@ -295,7 +295,6 @@
<script name="script/tobago.js"/>
<script name="script/calendar.js"/>
<script name="script/dateConverter.js"/>
- <script name="script/theme-config.js"/>
<script name="script/tobago-menu.js"/>
<script name="script/tobago-sheet.js"/>
<script name="script/tobago-tabgroup.js"/>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1039385&r1=1039384&r2=1039385&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Fri Nov 26 14:37:52 2010
@@ -1693,6 +1693,43 @@ var Tobago = {
}
};
+Tobago.Config = {
+ set: function(name, key, value) {
+ if (!this[name]) {
+ this[name] = {};
+ }
+ this[name][key] = value;
+ },
+
+ get: function(name, key) {
+ while (name && !(this[name] && this[name][key])) {
+ name = this.getFallbackName(name);
+ }
+
+ if (name) {
+ return this[name][key];
+ } else {
+;;; LOG.warn("Tobago.Config.get("+ name + ", " + key + ") = undefined" );
+ return 0;
+ }
+ },
+
+ fallbackNames: {},
+
+ getFallbackName: function(name){
+ if (this.fallbackNames[name]) {
+ return this.fallbackNames[name];
+ } else if (name == "Tobago") {
+ return undefined;
+ } else {
+ return "Tobago";
+ }
+ }
+};
+
+
+Tobago.Config.set("Tobago", "themeConfig", "standard/standard");
+
Tobago.In = function(inId, required, requiredClass, maxLength) {
this.id = inId;
this.required = required;