You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2007/01/18 23:51:05 UTC

svn commit: r497613 - in /cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js: DropdownDateTimePicker.js InfoPopup.js templates/InfoPopup.html

Author: bruno
Date: Thu Jan 18 14:51:04 2007
New Revision: 497613

URL: http://svn.apache.org/viewvc?view=rev&rev=497613
Log:
* removing license header again from dojo template file InfoPopup.html, it breaks dojo
* normalizing containerToggle settings

Modified:
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/InfoPopup.html

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js?view=diff&rev=497613&r1=497612&r2=497613
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js Thu Jan 18 14:51:04 2007
@@ -45,7 +45,7 @@
 
         timeIconURL: cocoon.resourcesUri + "/forms/js/templates/images/timeIcon.gif",
 
-        containerToggle: "explode",
+        containerToggle: "plain", /* plain, explode, wipe, fade */
 
         containerToggleDuration: 150,
 

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js?view=diff&rev=497613&r1=497612&r2=497613
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js Thu Jan 18 14:51:04 2007
@@ -42,7 +42,7 @@
 
         closeIconURL: cocoon.resourcesUri + "/forms/js/templates/images/close.gif",
 
-        containerToggle: "show",
+        containerToggle: "plain", /* plain, explode, wipe, fade */
 
         containerToggleDuration: 150,
 
@@ -76,10 +76,6 @@
 
             // copy content from original element to the popup
             this.contentNode.innerHTML = this.getFragNodeRef(frag).innerHTML;
-//            var origContent = this.getFragNodeRef(frag).childNodes;
-//            for (var i = 0; i < origContent.length; i++) {
-//                this.contentNode.appendChild(origContent.item(i));
-//            }
 
             // make sure popup can be visible
             this.popupNode.style.display = "";

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/InfoPopup.html
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/InfoPopup.html?view=diff&rev=497613&r1=497612&r2=497613
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/InfoPopup.html (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/InfoPopup.html Thu Jan 18 14:51:04 2007
@@ -1,19 +1,3 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
 <span style='white-space: nowrap'>
     <img src='${this.iconURL}' dojoAttachEvent='onclick:_onIconClick' dojoAttachPoint='buttonNode'
          style='vertical-align: middle; cursor: pointer; cursor: hand'/>