click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r956615 - in /click/trunk/click: LICENSE.txt NOTICE.txt extras/src/META-INF/resources/click/menu-fix-ie6.js
Date Mon, 21 Jun 2010 15:03:18 GMT
Author: sabob
Date: Mon Jun 21 15:03:18 2010
New Revision: 956615

URL: http://svn.apache.org/viewvc?rev=956615&view=rev
Log:
added bgiframe license and attribution

Modified:
    click/trunk/click/LICENSE.txt
    click/trunk/click/NOTICE.txt
    click/trunk/click/extras/src/META-INF/resources/click/menu-fix-ie6.js

Modified: click/trunk/click/LICENSE.txt
URL: http://svn.apache.org/viewvc/click/trunk/click/LICENSE.txt?rev=956615&r1=956614&r2=956615&view=diff
==============================================================================
--- click/trunk/click/LICENSE.txt (original)
+++ click/trunk/click/LICENSE.txt Mon Jun 21 15:03:18 2010
@@ -793,3 +793,24 @@ STRIPES FRAMEWORK LICENSE
 
 org.apache.click.service.DeployUtils is taken from the Stripes Framework
 distributed under the terms of the Apache Software License 2.0.
+
+======================================================================
+
+JQUERY BGIFRAME PLUGIN LICENSE (MIT License)
+
+Copyright (c) 2010 Brandon Aaron
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Modified: click/trunk/click/NOTICE.txt
URL: http://svn.apache.org/viewvc/click/trunk/click/NOTICE.txt?rev=956615&r1=956614&r2=956615&view=diff
==============================================================================
--- click/trunk/click/NOTICE.txt (original)
+++ click/trunk/click/NOTICE.txt Mon Jun 21 15:03:18 2010
@@ -68,4 +68,8 @@ http://www.famfamfam.com/lab/icons
 
 This product includes the class org.apache.click.service.DeployUtils.java
 from the Stripes Framework, released under the Apache 2.0 license.
-http://stripesframework.org
\ No newline at end of file
+http://stripesframework.org
+
+This product includes the JQuery bgiframe plugin, developed by
+Brandon Aaron, distributed under the terms of the MIT license.
+http://brandonaaron.net/code/bgiframe/docs/

Modified: click/trunk/click/extras/src/META-INF/resources/click/menu-fix-ie6.js
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/META-INF/resources/click/menu-fix-ie6.js?rev=956615&r1=956614&r2=956615&view=diff
==============================================================================
--- click/trunk/click/extras/src/META-INF/resources/click/menu-fix-ie6.js (original)
+++ click/trunk/click/extras/src/META-INF/resources/click/menu-fix-ie6.js Mon Jun 21 15:03:18
2010
@@ -1,3 +1,8 @@
+/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
+* Licensed under the MIT License (LICENSE.txt).
+*
+* Version 2.1.3-pre
+*/
 // Ensure Click namespace exists
 if ( typeof Click == 'undefined' )
     Click = {};
@@ -15,18 +20,16 @@ Click.menu.fixHiddenMenu = function(menu
     	return;
     }
 
-    s ={
+    var s = {
         top : 'auto',
         left : 'auto',
         width : 'auto',
         height : 'auto',
         opacity : true,
-        src : "javascript:'<html></html>'"
-    }, s || {};
+        src : 'javascript:false;'
+    };
 
-    var prop = function(n){
-        return n&&n.constructor==Number?n+'px':n;
-    }
+    var prop = function(n){return n&&n.constructor==Number?n+'px':n;}
 
     var html = '<iframe class="bgiframe"frameborder="0"tabindex="-1"src="'+s.src+'"'+
         'style="display:block;position:absolute;z-index:-1;'+



Mime
View raw message