compass-jquery-plugin 0.3.2.5 → 0.3.2.6

data/README.md

@@ -18,7 +18,7 @@ A Sass-based Meta-Framework for Compass that allows you to mix and match any of
 * jquery.dynatree.js V1.0.2
 * jquery.ribbon.js
 * jquery.jqGrid.js V3.8.2 (with minor changes to make it RESTful)
-
+* jquery.tinymce.js V3.4
 and for mobile devices <i>(using pure haml/sass without compass)</i>:
 
 * jquery.mobile.js 1.0a3
@@ -168,6 +168,19 @@ To use the stylesheets and javacripts include:
   = stylesheet_link_tag :ical, :media => 'screen, projection'
   = javascript_include_tag :ical</pre>
 
+
+jQuery TinyMCE Plugin
+--------------------
+
+Use compass to install the jQuery TinyMCE Editor Javascript WYSIWYG Editor into your project.
+
+<pre>compass install [-r jquery] jquery/tiny_mce <project name></pre>
+
+To use the javascripts include:
+
+<pre>
+= javascript_include_tag :tiny_mce</pre>
+
 Graphics
 --------
 
@@ -280,6 +293,7 @@ jQuery Plugins included:
 * Andrew M Andrews III for [Any+Time][29]
 * Steven Wittens for [Farbtastic Colorpicker plugin][30]
 * Adam Shaw for [FullCalendar][31]
+* Moxiecode Systems AB for [TinyMCE][40]
 
 Other stuff included:
 ---------------------
@@ -343,3 +357,4 @@ Copyright &copy; 2009-2011 Kosmas Schuetz. See LICENSE for details.
   [37]: http://github.com/cowboy/jquery-dotimeout
   [38]: http://github.com/gamache/DSt
   [39]: http://github.com/thegrubbsian/jquery.ganttView
+  [40]: http://tinymce.moxiecode.com/

data/VERSION.yml

@@ -1,6 +1,6 @@
 ---
-:commit:
-:state:     5
+:commit:    
+:state:     6
 :tiny:      2
 :minor:     3
 :major:     0

data/lib/handle_js_files.rb

@@ -1,3 +1,6 @@
+require 'fileutils'
+require 'find'
+
 GEM_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 GOOGLE_JS_COMPRESSOR = File.join(GEM_ROOT, 'lib', 'google-compiler-20100917.jar')
 YUI_JS_COMPRESSOR = File.join(GEM_ROOT, 'lib', 'yuicompressor-2.4.4.jar')
@@ -25,3 +28,21 @@ def all_files(pattern)
   FileList[pattern].collect { |filename| File.read(filename) }.join "\n\n"
 end
 
+def handleRecursiveDir(manifest, srcDir, destDir)
+  len = srcDir.length
+  actualDir = destDir
+  FileUtils.mkdir_p(destDir)
+  Find.find(srcDir) do |entry|
+    if File.directory?(entry) and entry != srcDir and entry != actualDir
+      actualDir = File.join(destDir, entry[len, 255])
+      FileUtils.mkdir_p(actualDir)
+    end
+  end
+  Find.find(srcDir) do |entry|
+    if File.file?(entry)
+      ending = entry[len, 255]
+      FileUtils.cp(entry, File.join(destDir, ending))
+      manifest.print "javascript 'tiny_mce/#{ending}'\n"
+    end
+  end
+end

data/lib/jquery/gridify/grid_view.rb

@@ -203,7 +203,7 @@ module Gridify
 
       if tree_grid
         vals[:treeGrid] = tree_grid
-        vals[:gridview] = false
+        vals[:gridview] = true
         vals[:sortable] = false
       end
 
@@ -212,7 +212,7 @@ module Gridify
         vals[:subGrid] = sub_grid
         vals[:subGridUrl] = sub_grid_url
         vals[:subGridModel] = sub_grid_model
-        vals[:gridview] = false
+        vals[:gridview] = true
       end
 
       #events

data/lib/jquery/jquery_selector_assertions.rb

@@ -30,48 +30,12 @@ module ActionController
             :insert_bottom => "\(jQuery|$\)\\(#{RJS_ANY_ID}\\)\\.append\\(#{RJS_PATTERN_HTML}\\)",
             :effect => "\(jQuery|$\)\\(#{RJS_ANY_ID}\\)\\.effect\\(",
             :highlight => "\(jQuery|$\)\\(#{RJS_ANY_ID}\\)\\.effect\\('highlight'"
-
-        =
-            begin
-              TODO :
-
-                  I 've never used the chained_* so I don' t know if they work.
-
-                                                                              I couldn 't seem to get assert_select_rjs to actually match the single quoted ids
-            which are created by some of the effects like ...
-             ... jQuery(' #item_1559').effect('highlight',{},1000);
-              so I modified jrails/lib/jrails.rb line 337
-              ... javascript = "#{JQUERY_VAR}('#{jquery_id(element_id)}').#{mode || 'effect'}('#{name}'"
-              to
-              ... javascript = "#{JQUERY_VAR}(\"#{jquery_id(element_id)}\").#{mode || 'effect'}('#{name}'"
-              so it writes double quotes like most of the others.This change should probably be
-              done to the others, but as I don 't use them so haven' t tested them.
-
-                                                                                  My other option seemed to require modifying rails ' selector_assertions.rb line 427
-             ... id ? statement.gsub(RJS_ANY_ID, "\"#{id}\"") : statement
-            which forces the expectation that the id is double quoted.  If I changed it to
-             ... statement.gsub(RJS_ANY_ID, "[\"']{1} #{id}[\"']{1}")
-              I believe that it would work as the logic seemed to work in some testing.
-                                                                                   I have not actually tried to modify rails, as this file doesn 't seem to
-            actually be in the git repository.
-
-
-            jrails now uses a nonconflict option so $ is jQuery.  I put both in the pattern in case it gets changed.
-
-                          :insert_after => "",
-                          :insert_before => "",
-            =end
-
         }
 
         [:remove, :show, :hide, :toggle, :reset].each do |action|
           RJS_STATEMENTS[action] = "\(jQuery|$\)\\(#{RJS_ANY_ID}\\)\\.#{action}\\(\\)"
         end
 
-        # TODO:
-        #RJS_STATEMENTS[:insert_html] = "Element.insert\\(#{RJS_ANY_ID}, \\{ (#{RJS_INSERTIONS.join('|')}):
-        #{RJS_PATTERN_HTML} \\}\\)"
-
         RJS_STATEMENTS[:any] = Regexp.new("(#{RJS_STATEMENTS.values.join('|')})")
         RJS_PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
       end

data/lib/jquery/tiny_mce.rb

@@ -0,0 +1,5 @@
+module ActionView
+  module Helpers
+
+  end
+end

data/templates/dynatree/jquery.dynatree.js

@@ -255,11 +255,11 @@ var DTNodeStatus_Ok = 0;
             /**
              * Create <li><span>..</span> .. </li> tags for this node.
              *
-             * <li id='key'> // This div contains the node's span and list of child div's.
+             * <li id='KEY' dtnode=NODE> // This div contains the node's span and list of child div's.
              *   <span class='title'>S S S A</span> // Span contains graphic spans and title <a> tag
              *   <ul> // only present, when node has children
-             *       <li>child1</li>
-             *       <li>child2</li>
+             *       <li id='KEY' dtnode=NODE>child1</li>
+             *       <li id='KEY' dtnode=NODE>child2</li>
              *   </ul>
              * </li>
              */
@@ -552,7 +552,7 @@ var DTNodeStatus_Ok = 0;
                     this._setStatusNode(null);
                     $(this.span).removeClass(this.tree.options.classNames.nodeLoading);
                     this.isLoading = false;
-                    this.render();
+//				this.render();
                     if (this.tree.options.autoFocus) {
                         if (this === this.tree.tnRoot && this.childList && this.childList.length > 0) {
                             // special case: using ajaxInit
@@ -1094,7 +1094,7 @@ var DTNodeStatus_Ok = 0;
                 }
             }
             // Make sure that clicks stop, otherwise <a href='#'> jumps to the top
-            return false;
+            event.preventDefault();
         },
 
         _onDblClick: function(event) {
@@ -1189,7 +1189,10 @@ var DTNodeStatus_Ok = 0;
                     handled = false;
             }
             // Return false, if handled, to prevent default processing
-            return !handled;
+//		return !handled;
+            if (handled) {
+                event.preventDefault();
+            }
         },
 
         _onKeypress: function(event) {
@@ -1481,7 +1484,9 @@ var DTNodeStatus_Ok = 0;
                 this.childList = [];
             } else if (! beforeNode) {
                 // Fix 'lastsib'
-                $(this.childList[this.childList.length - 1].span).removeClass(opts.classNames.lastsib);
+                if (this.childList.length > 0) {
+                    $(this.childList[this.childList.length - 1].span).removeClass(opts.classNames.lastsib);
+                }
             }
             if (beforeNode) {
                 var iBefore = $.inArray(beforeNode, this.childList);
@@ -2062,21 +2067,9 @@ var DTNodeStatus_Ok = 0;
             // We don't do this however, if we try to load from an embedded UL element.
             if (opts.children || (opts.initAjax && opts.initAjax.url) || opts.initId) {
                 $(this.divTree).empty();
-            } else if (this.divRoot) {
-                $(this.divRoot).remove();
             }
-            /*
-             // create the root element
-             this.tnRoot = new DynaTreeNode(null, this, {title: opts.title, key: "root"});
-             this.tnRoot.data.isFolder = true;
-             this.tnRoot.render(false, false);
-             this.divRoot = this.tnRoot.div;
-             this.divRoot.className = opts.classNames.container;
-
-             // add root to container
-             // TODO: this should be delayed until all children have been created for performance reasons
-             this.divTree.appendChild(this.divRoot);
-             */
+            var $ulInitialize = this.$tree.find(">ul:first").hide();
+
             // Create the root element
             this.tnRoot = new DynaTreeNode(null, this, {});
             this.tnRoot.bExpanded = true;
@@ -2107,9 +2100,9 @@ var DTNodeStatus_Ok = 0;
 
             } else {
                 // Init tree from the first UL element inside the container <div>
-                var $ul = this.$tree.find(">ul:first").hide();
-                this._createFromTag(root, $ul);
-                $ul.remove();
+//			var $ul = this.$tree.find(">ul:first").hide();
+                this._createFromTag(root, $ulInitialize);
+                $ulInitialize.remove();
             }
 
             this._checkConsistency();

data/templates/dynatree/jquery.dynatree.min.js

@@ -12,7 +12,7 @@ f.fx&&c===e){d=f.fx.duration||200;g(this.ul).animate(f.fx,d)}else this.ul.style.
 else if(this.childList.length===1&&this.childList[0].isStatusNode())return;return true}return!!this.childList},isFirstSibling:function(){var a=this.parent;return!a||a.childList[0]===this},isLastSibling:function(){var a=this.parent;return!a||a.childList[a.childList.length-1]===this},getPrevSibling:function(){if(!this.parent)return null;for(var a=this.parent.childList,b=1,c=a.length;b<c;b++)if(a[b]===this)return a[b-1];return null},getNextSibling:function(){if(!this.parent)return null;for(var a=this.parent.childList,
 b=0,c=a.length-1;b<c;b++)if(a[b]===this)return a[b+1];return null},isStatusNode:function(){return this.data.isStatusNode===true},isChildOf:function(a){return this.parent&&this.parent===a},isDescendantOf:function(a){if(!a)return false;for(var b=this.parent;b;){if(b===a)return true;b=b.parent}return false},countChildren:function(){var a=this.childList;if(!a)return 0;for(var b=a.length,c=0,d=b;c<d;c++)b+=a[c].countChildren();return b},sortChildren:function(a,b){var c=this.childList;if(c){a=a||function(f,
 h){return f.data.title===h.data.title?0:f.data.title>h.data.title?1:-1};c.sort(a);if(b)for(var d=0,e=c.length;d<e;d++)c[d].childList&&c[d].sortChildren(a,"$norender$");b!=="$norender$"&&this.render()}},_setStatusNode:function(a){var b=this.childList?this.childList[0]:null;if(a)if(b){a.isStatusNode=true;a.key="_statusNode";b.data=a;b.render()}else{a.isStatusNode=true;a.key="_statusNode";this.addChild(a)}else if(b&&b.isStatusNode()){try{this.ul&&this.ul.removeChild(b.li)}catch(c){}if(this.childList.length===
-1)this.childList=[];else this.childList.shift()}},setLazyNodeStatus:function(a,b){var c=b&&b.tooltip?b.tooltip:null,d=b&&b.info?" ("+b.info+")":"";switch(a){case DTNodeStatus_Ok:this._setStatusNode(null);g(this.span).removeClass(this.tree.options.classNames.nodeLoading);this.isLoading=false;this.render();if(this.tree.options.autoFocus)this===this.tree.tnRoot&&this.childList&&this.childList.length>0?this.childList[0].focus():this.focus();break;case DTNodeStatus_Loading:this.isLoading=true;g(this.span).addClass(this.tree.options.classNames.nodeLoading);
+1)this.childList=[];else this.childList.shift()}},setLazyNodeStatus:function(a,b){var c=b&&b.tooltip?b.tooltip:null,d=b&&b.info?" ("+b.info+")":"";switch(a){case DTNodeStatus_Ok:this._setStatusNode(null);g(this.span).removeClass(this.tree.options.classNames.nodeLoading);this.isLoading=false;if(this.tree.options.autoFocus)this===this.tree.tnRoot&&this.childList&&this.childList.length>0?this.childList[0].focus():this.focus();break;case DTNodeStatus_Loading:this.isLoading=true;g(this.span).addClass(this.tree.options.classNames.nodeLoading);
 this.parent||this._setStatusNode({title:this.tree.options.strings.loading+d,tooltip:c,addClass:this.tree.options.classNames.nodeWait});break;case DTNodeStatus_Error:this.isLoading=false;this._setStatusNode({title:this.tree.options.strings.loadError+d,tooltip:c,addClass:this.tree.options.classNames.nodeError});break;default:throw"Bad LazyNodeStatus: '"+a+"'.";}},_parentList:function(a,b){for(var c=[],d=b?this:this.parent;d;){if(a||d.parent)c.unshift(d);d=d.parent}return c},getLevel:function(){for(var a=
 0,b=this.parent;b;){a++;b=b.parent}return a},_getTypeForOuterNodeEvent:function(a){var b=this.tree.options.classNames,c=a.target;if(c.className.indexOf(b.node)<0)return null;var d=a.pageX-c.offsetLeft;a=a.pageY-c.offsetTop;for(var e=0,f=c.childNodes.length;e<f;e++){var h=c.childNodes[e],i=h.offsetLeft-c.offsetLeft,j=h.offsetTop-c.offsetTop,k=h.clientWidth,r=h.clientHeight;if(d>=i&&d<=i+k&&a>=j&&a<=j+r)if(h.className==b.title)return"title";else if(h.className==b.expander)return"expander";else if(h.className==
 b.checkbox)return"checkbox";else if(h.className==b.nodeIcon)return"icon"}return"prefix"},getEventTargetType:function(a){var b=a&&a.target?a.target.className:"",c=this.tree.options.classNames;if(b===c.title)return"title";else if(b===c.expander)return"expander";else if(b===c.checkbox)return"checkbox";else if(b===c.nodeIcon)return"icon";else if(b===c.empty||b===c.vline||b===c.connector)return"prefix";else if(b.indexOf(c.node)>=0)return this._getTypeForOuterNodeEvent(a);return null},isVisible:function(){for(var a=
@@ -26,19 +26,19 @@ g(this.span).removeClass(d.classNames.selected);c&&d.selectMode===3&&this._fixSe
 if(true===a.onLazyRead.call(this.tree,this)){this.setLazyNodeStatus(DTNodeStatus_Ok);this.tree.logDebug("_loadContent: succeeded - %o",this)}}catch(b){this.tree.logWarning("_loadContent: failed - %o",b);this.setLazyNodeStatus(DTNodeStatus_Error,{tooltip:""+b})}},_expand:function(a,b){if(this.bExpanded===a)this.tree.logDebug("dtnode._expand(%o) IGNORED - %o",a,this);else{this.tree.logDebug("dtnode._expand(%o) - %o",a,this);var c=this.tree.options;if(!a&&this.getLevel()<c.minExpandLevel)this.tree.logDebug("dtnode._expand(%o) prevented collapse - %o",
 a,this);else if(!(c.onQueryExpand&&c.onQueryExpand.call(this.tree,a,this)===false)){this.bExpanded=a;if(c.persist)a?this.tree.persistence.addExpand(this.data.key):this.tree.persistence.clearExpand(this.data.key);this.render(!(this.data.isLazy&&this.childList===null)&&!this.isLoading&&!b);if(this.bExpanded&&this.parent&&c.autoCollapse)for(var d=this._parentList(false,true),e=0,f=d.length;e<f;e++)d[e].collapseSiblings();c.activeVisible&&this.tree.activeNode&&!this.tree.activeNode.isVisible()&&this.tree.activeNode.deactivate();
 if(a&&this.data.isLazy&&this.childList===null&&!this.isLoading)this._loadContent();else c.onExpand&&c.onExpand.call(this.tree,a,this)}}},expand:function(a){a=a!==false;!this.childList&&!this.data.isLazy&&a||this.parent===null&&!a||this._expand(a)},scheduleAction:function(a,b){if(this.tree.timer){clearTimeout(this.tree.timer);this.tree.logDebug("clearTimeout(%o)",this.tree.timer)}var c=this;switch(a){case "cancel":break;case "expand":this.tree.timer=setTimeout(function(){c.tree.logDebug("setTimeout: trigger expand");
-c.expand(true)},b);break;case "activate":this.tree.timer=setTimeout(function(){c.tree.logDebug("setTimeout: trigger activate");c.activate()},b);break;default:throw"Invalid mode "+a;}this.tree.logDebug("setTimeout(%s, %s): %s",a,b,this.tree.timer)},toggleExpand:function(){this.expand(!this.bExpanded)},collapseSiblings:function(){if(this.parent!==null)for(var a=this.parent.childList,b=0,c=a.length;b<c;b++)a[b]!==this&&a[b].bExpanded&&a[b]._expand(false)},_onClick:function(a){a=this.getEventTargetType(a);
-if(a==="expander"){this.toggleExpand();this.focus()}else if(a==="checkbox"){this.toggleSelect();this.focus()}else{this._userActivate();a=this.span.getElementsByTagName("a");if(a[0])g.browser.msie||a[0].focus();else return true}return false},_onDblClick:function(){},_onKeydown:function(a){var b=true,c;switch(a.which){case 107:case 187:this.bExpanded||this.toggleExpand();break;case 109:case 189:this.bExpanded&&this.toggleExpand();break;case 32:this._userActivate();break;case 8:this.parent&&this.parent.focus();
+c.expand(true)},b);break;case "activate":this.tree.timer=setTimeout(function(){c.tree.logDebug("setTimeout: trigger activate");c.activate()},b);break;default:throw"Invalid mode "+a;}this.tree.logDebug("setTimeout(%s, %s): %s",a,b,this.tree.timer)},toggleExpand:function(){this.expand(!this.bExpanded)},collapseSiblings:function(){if(this.parent!==null)for(var a=this.parent.childList,b=0,c=a.length;b<c;b++)a[b]!==this&&a[b].bExpanded&&a[b]._expand(false)},_onClick:function(a){var b=this.getEventTargetType(a);
+if(b==="expander"){this.toggleExpand();this.focus()}else if(b==="checkbox"){this.toggleSelect();this.focus()}else{this._userActivate();b=this.span.getElementsByTagName("a");if(b[0])g.browser.msie||b[0].focus();else return true}a.preventDefault()},_onDblClick:function(){},_onKeydown:function(a){var b=true,c;switch(a.which){case 107:case 187:this.bExpanded||this.toggleExpand();break;case 109:case 189:this.bExpanded&&this.toggleExpand();break;case 32:this._userActivate();break;case 8:this.parent&&this.parent.focus();
 break;case 37:if(this.bExpanded){this.toggleExpand();this.focus()}else this.parent&&this.parent.parent&&this.parent.focus();break;case 39:if(!this.bExpanded&&(this.childList||this.data.isLazy)){this.toggleExpand();this.focus()}else this.childList&&this.childList[0].focus();break;case 38:for(c=this.getPrevSibling();c&&c.bExpanded&&c.childList;)c=c.childList[c.childList.length-1];if(!c&&this.parent&&this.parent.parent)c=this.parent;c&&c.focus();break;case 40:if(this.bExpanded&&this.childList)c=this.childList[0];
-else{a=this._parentList(false,true);for(var d=a.length-1;d>=0;d--)if(c=a[d].getNextSibling())break}c&&c.focus();break;default:b=false}return!b},_onKeypress:function(){},_onFocus:function(a){var b=this.tree.options;if(a.type=="blur"||a.type=="focusout"){b.onBlur&&b.onBlur.call(this.tree,this);this.tree.tnFocused&&g(this.tree.tnFocused.span).removeClass(b.classNames.focused);this.tree.tnFocused=null;b.persist&&g.cookie(b.cookieId+"-focus","",b.cookie)}else if(a.type=="focus"||a.type=="focusin"){if(this.tree.tnFocused&&
+else for(var d=this._parentList(false,true),e=d.length-1;e>=0;e--)if(c=d[e].getNextSibling())break;c&&c.focus();break;default:b=false}b&&a.preventDefault()},_onKeypress:function(){},_onFocus:function(a){var b=this.tree.options;if(a.type=="blur"||a.type=="focusout"){b.onBlur&&b.onBlur.call(this.tree,this);this.tree.tnFocused&&g(this.tree.tnFocused.span).removeClass(b.classNames.focused);this.tree.tnFocused=null;b.persist&&g.cookie(b.cookieId+"-focus","",b.cookie)}else if(a.type=="focus"||a.type=="focusin"){if(this.tree.tnFocused&&
 this.tree.tnFocused!==this){this.tree.logDebug("dtnode.onFocus: out of sync: curFocus: %o",this.tree.tnFocused);g(this.tree.tnFocused.span).removeClass(b.classNames.focused)}this.tree.tnFocused=this;b.onFocus&&b.onFocus.call(this.tree,this);g(this.tree.tnFocused.span).addClass(b.classNames.focused);b.persist&&g.cookie(b.cookieId+"-focus",this.data.key,b.cookie)}},visit:function(a,b){var c=true;if(b===true){c=a(this);if(c===false||c=="skip")return c}if(this.childList)for(var d=0,e=this.childList.length;d<
 e;d++){c=this.childList[d].visit(a,true);if(c===false)break}return c},visitParents:function(a,b){if(b&&a(this)===false)return false;for(var c=this.parent;c;){if(a(c)===false)return false;c=c.parent}return true},remove:function(){if(this===this.tree.root)throw"Cannot remove system root";return this.parent.removeChild(this)},removeChild:function(a){var b=this.childList;if(b.length==1){if(a!==b[0])throw"removeChild: invalid child";return this.removeChildren()}a===this.tree.activeNode&&a.deactivate();
 if(this.tree.options.persist){a.bSelected&&this.tree.persistence.clearSelect(a.data.key);a.bExpanded&&this.tree.persistence.clearExpand(a.data.key)}a.removeChildren(true);this.ul.removeChild(a.li);for(var c=0,d=b.length;c<d;c++)if(b[c]===a){this.childList.splice(c,1);break}},removeChildren:function(a,b){this.tree.logDebug("%s.removeChildren(%o)",this,a);var c=this.tree,d=this.childList;if(d){for(var e=0,f=d.length;e<f;e++){var h=d[e];h===c.activeNode&&!b&&h.deactivate();if(this.tree.options.persist&&
 !b){h.bSelected&&this.tree.persistence.clearSelect(h.data.key);h.bExpanded&&this.tree.persistence.clearExpand(h.data.key)}h.removeChildren(true,b);this.ul&&this.ul.removeChild(h.li)}this.childList=null}if(!a){this.isLoading=false;this.render()}},setTitle:function(a){this.fromDict({title:a})},reload:function(){throw"Use reloadChildren() instead";},reloadChildren:function(a){if(this.parent===null)throw"Use tree.reload() instead";else if(!this.data.isLazy)throw"node.reloadChildren() requires lazy nodes.";
 if(a){var b=this,c="nodeLoaded.dynatree."+this.tree.$tree.attr("id")+"."+this.data.key;this.tree.$tree.bind(c,function(d,e,f){b.tree.$tree.unbind(c);b.tree.logInfo("loaded %o, %o, %o",d,e,f);if(e!==b)throw"got invalid load event";a.call(b.tree,e,f)})}this.removeChildren();this._loadContent()},_loadKeyPath:function(a,b){var c=this.tree;c.logDebug("%s._loadKeyPath(%s)",this,a);if(a==="")throw"Key path must not be empty";var d=a.split(c.options.keyPathSeparator);if(d[0]==="")throw"Key path must be relative (don't start with '/')";
 for(var e=d.shift(),f=0,h=this.childList.length;f<h;f++){var i=this.childList[f];if(i.data.key===e){if(d.length===0)b.call(c,i,"ok");else if(i.data.isLazy&&(i.childList===null||i.childList===undefined)){c.logDebug("%s._loadKeyPath(%s) -> reloading %s...",this,a,i);var j=this;i.reloadChildren(function(k,r){if(r){c.logDebug("%s._loadKeyPath(%s) -> reloaded %s.",k,a,k);b.call(c,i,"loaded");k._loadKeyPath(d.join(c.options.keyPathSeparator),b)}else{c.logWarning("%s._loadKeyPath(%s) -> reloadChildren() failed.",
-j,a);b.call(c,i,"error")}})}else{b.call(c,i,"loaded");i._loadKeyPath(d.join(c.options.keyPathSeparator),b)}return}}c.logWarning("Node not found: "+e)},resetLazy:function(){if(this.parent===null)throw"Use tree.reload() instead";else if(!this.data.isLazy)throw"node.resetLazy() requires lazy nodes.";this.expand(false);this.removeChildren()},_addChildNode:function(a,b){var c=this.tree,d=c.options,e=c.persistence;a.parent=this;if(this.childList===null)this.childList=[];else b||g(this.childList[this.childList.length-
-1].span).removeClass(d.classNames.lastsib);if(b){var f=g.inArray(b,this.childList);if(f<0)throw"<beforeNode> must be a child of <this>";this.childList.splice(f,0,a)}else this.childList.push(a);f=c.isInitializing();if(d.persist&&e.cookiesFound&&f){if(e.activeKey==a.data.key)c.activeNode=a;if(e.focusedKey==a.data.key)c.focusNode=a;a.bExpanded=g.inArray(a.data.key,e.expandedKeyList)>=0;a.bSelected=g.inArray(a.data.key,e.selectedKeyList)>=0}else{if(a.data.activate){c.activeNode=a;if(d.persist)e.activeKey=
-a.data.key}if(a.data.focus){c.focusNode=a;if(d.persist)e.focusedKey=a.data.key}a.bExpanded=a.data.expand===true;a.bExpanded&&d.persist&&e.addExpand(a.data.key);a.bSelected=a.data.select===true;a.bSelected&&d.persist&&e.addSelect(a.data.key)}if(d.minExpandLevel>=a.getLevel())this.bExpanded=true;if(a.bSelected&&d.selectMode==3)for(d=this;d;){d.hasSubSel||d._setSubSel(true);d=d.parent}c.bEnableUpdate&&this.render();return a},addChild:function(a,b){if(typeof a=="string")throw"Invalid data type for "+
+j,a);b.call(c,i,"error")}})}else{b.call(c,i,"loaded");i._loadKeyPath(d.join(c.options.keyPathSeparator),b)}return}}c.logWarning("Node not found: "+e)},resetLazy:function(){if(this.parent===null)throw"Use tree.reload() instead";else if(!this.data.isLazy)throw"node.resetLazy() requires lazy nodes.";this.expand(false);this.removeChildren()},_addChildNode:function(a,b){var c=this.tree,d=c.options,e=c.persistence;a.parent=this;if(this.childList===null)this.childList=[];else b||this.childList.length>0&&
+g(this.childList[this.childList.length-1].span).removeClass(d.classNames.lastsib);if(b){var f=g.inArray(b,this.childList);if(f<0)throw"<beforeNode> must be a child of <this>";this.childList.splice(f,0,a)}else this.childList.push(a);f=c.isInitializing();if(d.persist&&e.cookiesFound&&f){if(e.activeKey==a.data.key)c.activeNode=a;if(e.focusedKey==a.data.key)c.focusNode=a;a.bExpanded=g.inArray(a.data.key,e.expandedKeyList)>=0;a.bSelected=g.inArray(a.data.key,e.selectedKeyList)>=0}else{if(a.data.activate){c.activeNode=
+a;if(d.persist)e.activeKey=a.data.key}if(a.data.focus){c.focusNode=a;if(d.persist)e.focusedKey=a.data.key}a.bExpanded=a.data.expand===true;a.bExpanded&&d.persist&&e.addExpand(a.data.key);a.bSelected=a.data.select===true;a.bSelected&&d.persist&&e.addSelect(a.data.key)}if(d.minExpandLevel>=a.getLevel())this.bExpanded=true;if(a.bSelected&&d.selectMode==3)for(d=this;d;){d.hasSubSel||d._setSubSel(true);d=d.parent}c.bEnableUpdate&&this.render();return a},addChild:function(a,b){if(typeof a=="string")throw"Invalid data type for "+
 a;else if(!a||a.length===0)return;else if(a instanceof p)return this._addChildNode(a,b);a.length||(a=[a]);for(var c=this.tree.enableUpdate(false),d=null,e=0,f=a.length;e<f;e++){var h=a[e],i=this._addChildNode(new p(this,this.tree,h),b);d||(d=i);h.children&&i.addChild(h.children,null)}this.tree.enableUpdate(c);return d},append:function(a){this.tree.logWarning("node.append() is deprecated (use node.addChild() instead).");return this.addChild(a,null)},appendAjax:function(a){var b=this;this.removeChildren(false,
 true);this.setLazyNodeStatus(DTNodeStatus_Loading);if(a.debugLazyDelay){var c=a.debugLazyDelay;a.debugLazyDelay=0;this.tree.logInfo("appendAjax: waiting for debugLazyDelay "+c);setTimeout(function(){b.appendAjax(a)},c)}else{var d=a.success,e=a.error,f="nodeLoaded.dynatree."+this.tree.$tree.attr("id")+"."+this.data.key,h=g.extend({},this.tree.options.ajaxDefaults,a,{success:function(i){var j=b.tree.phase;b.tree.phase="init";if(h.postProcess)i=h.postProcess.call(this,i,this.dataType);if(!g.isArray(i)||
 i.length!==0)b.addChild(i,null);b.tree.phase="postInit";d&&d.call(h,b);b.tree.logInfo("trigger "+f);b.tree.$tree.trigger(f,[b,true]);b.tree.phase=j;b.setLazyNodeStatus(DTNodeStatus_Ok);if(g.isArray(i)&&i.length===0){b.childList=[];b.render()}},error:function(i,j,k){b.tree.logWarning("appendAjax failed:",j,":\n",i,"\n",k);e&&e.call(h,b,i,j,k);b.tree.$tree.trigger(f,[b,false]);b.setLazyNodeStatus(DTNodeStatus_Error,{info:j,tooltip:""+k})}});g.ajax(h)}},move:function(a,b){var c;if(this!==a){if(!this.parent)throw"Cannot move system root";
@@ -52,9 +52,9 @@ a);if(g.inArray(a,this.selectedKeyList)<0){this.selectedKeyList.push(a);g.cookie
 focusedKey:this.activeKey,expandedKeyList:this.expandedKeyList,selectedKeyList:this.selectedKeyList}},lastentry:undefined};var q=o.create();q.version="$Version:$";q.prototype={initialize:function(a){this.phase="init";this.$widget=a;this.options=a.options;this.$tree=a.element;this.timer=null;this.divTree=this.$tree.get(0);m(this)},_load:function(a){var b=this.options;this.bEnableUpdate=true;this._nodeCount=1;this.focusNode=this.activeNode=null;b.rootVisible!==undefined&&_log("warn","Option 'rootVisible' is no longer supported.");
 if(b.minExpandLevel<1){_log("warn","Option 'minExpandLevel' must be >= 1.");b.minExpandLevel=1}if(b.classNames!==g.ui.dynatree.prototype.options.classNames)b.classNames=g.extend({},g.ui.dynatree.prototype.options.classNames,b.classNames);if(b.ajaxDefaults!==g.ui.dynatree.prototype.options.ajaxDefaults)b.ajaxDefaults=g.extend({},g.ui.dynatree.prototype.options.ajaxDefaults,b.ajaxDefaults);if(b.dnd!==g.ui.dynatree.prototype.options.dnd)b.dnd=g.extend({},g.ui.dynatree.prototype.options.dnd,b.dnd);b.imagePath||
 g("script").each(function(){if(this.src.search(/.*dynatree[^\/]*\.js$/i)>=0){b.imagePath=this.src.indexOf("/")>=0?this.src.slice(0,this.src.lastIndexOf("/"))+"/skin/":"skin/";logMsg("Guessing imagePath from '%s': '%s'",this.src,b.imagePath);return false}});this.persistence=new n(b.cookieId,b.cookie);if(b.persist){g.cookie||_log("warn","Please include jquery.cookie.js to use persistence.");this.persistence.read()}this.logDebug("DynaTree.persistence: %o",this.persistence.toDict());this.cache={tagEmpty:"<span class='"+
-b.classNames.empty+"'></span>",tagVline:"<span class='"+b.classNames.vline+"'></span>",tagExpander:"<span class='"+b.classNames.expander+"'></span>",tagConnector:"<span class='"+b.classNames.connector+"'></span>",tagNodeIcon:"<span class='"+b.classNames.nodeIcon+"'></span>",tagCheckbox:"<span class='"+b.classNames.checkbox+"'></span>",lastentry:undefined};if(b.children||b.initAjax&&b.initAjax.url||b.initId)g(this.divTree).empty();else this.divRoot&&g(this.divRoot).remove();this.tnRoot=new p(null,
-this,{});this.tnRoot.bExpanded=true;this.tnRoot.render();this.divTree.appendChild(this.tnRoot.ul);var c=this.tnRoot,d=b.persist&&this.persistence.isReloading(),e=false,f=this.enableUpdate(false);this.logDebug("Dynatree._load(): read tree structure...");if(b.children)c.addChild(b.children);else if(b.initAjax&&b.initAjax.url){e=true;c.data.isLazy=true;this._reloadAjax(a)}else if(b.initId)this._createFromTag(c,g("#"+b.initId));else{a=this.$tree.find(">ul:first").hide();this._createFromTag(c,a);a.remove()}this._checkConsistency();
-this.logDebug("Dynatree._load(): render nodes...");this.enableUpdate(f);this.logDebug("Dynatree._load(): bind events...");this.$widget.bind();this.logDebug("Dynatree._load(): postInit...");this.phase="postInit";b.persist&&this.persistence.write();if(this.focusNode&&this.focusNode.isVisible()){this.logDebug("Focus on init: %o",this.focusNode);this.focusNode.focus()}!e&&b.onPostInit&&b.onPostInit.call(this,d,false);this.phase="idle"},_reloadAjax:function(a){var b=this.options;if(!b.initAjax||!b.initAjax.url)throw"tree.reload() requires 'initAjax' mode.";
+b.classNames.empty+"'></span>",tagVline:"<span class='"+b.classNames.vline+"'></span>",tagExpander:"<span class='"+b.classNames.expander+"'></span>",tagConnector:"<span class='"+b.classNames.connector+"'></span>",tagNodeIcon:"<span class='"+b.classNames.nodeIcon+"'></span>",tagCheckbox:"<span class='"+b.classNames.checkbox+"'></span>",lastentry:undefined};if(b.children||b.initAjax&&b.initAjax.url||b.initId)g(this.divTree).empty();var c=this.$tree.find(">ul:first").hide();this.tnRoot=new p(null,this,
+{});this.tnRoot.bExpanded=true;this.tnRoot.render();this.divTree.appendChild(this.tnRoot.ul);var d=this.tnRoot,e=b.persist&&this.persistence.isReloading(),f=false,h=this.enableUpdate(false);this.logDebug("Dynatree._load(): read tree structure...");if(b.children)d.addChild(b.children);else if(b.initAjax&&b.initAjax.url){f=true;d.data.isLazy=true;this._reloadAjax(a)}else if(b.initId)this._createFromTag(d,g("#"+b.initId));else{this._createFromTag(d,c);c.remove()}this._checkConsistency();this.logDebug("Dynatree._load(): render nodes...");
+this.enableUpdate(h);this.logDebug("Dynatree._load(): bind events...");this.$widget.bind();this.logDebug("Dynatree._load(): postInit...");this.phase="postInit";b.persist&&this.persistence.write();if(this.focusNode&&this.focusNode.isVisible()){this.logDebug("Focus on init: %o",this.focusNode);this.focusNode.focus()}!f&&b.onPostInit&&b.onPostInit.call(this,e,false);this.phase="idle"},_reloadAjax:function(a){var b=this.options;if(!b.initAjax||!b.initAjax.url)throw"tree.reload() requires 'initAjax' mode.";
 var c=this.persistence,d=g.extend({},b.initAjax);if(d.addActiveKey)d.data.activeKey=c.activeKey;if(d.addFocusedKey)d.data.focusedKey=c.focusedKey;if(d.addExpandedKeyList)d.data.expandedKeyList=c.expandedKeyList.join(",");if(d.addSelectedKeyList)d.data.selectedKeyList=c.selectedKeyList.join(",");if(b.onPostInit){d.success&&this.logWarning("initAjax: success callback is ignored when onPostInit was specified.");d.error&&this.logWarning("initAjax: error callback is ignored when onPostInit was specified.");
 var e=c.isReloading();d.success=function(f){b.onPostInit.call(f.tree,e,false);a&&a.call(f.tree,"ok")};d.error=function(f){b.onPostInit.call(f.tree,e,true);a&&a.call(f.tree,"error")}}this.logDebug("Dynatree._init(): send Ajax request...");this.tnRoot.appendAjax(d)},toString:function(){return"Dynatree '"+this.$tree.attr("id")+"'"},toDict:function(){return this.tnRoot.toDict(true)},serializeArray:function(a){a=this.getSelectedNodes(a);for(var b=this.$tree.attr("name")||this.$tree.attr("id"),c=[],d=0,
 e=a.length;d<e;d++)c.push({name:b,value:a[d].data.key});return c},getPersistData:function(){return this.persistence.toDict()},logDebug:function(){if(this.options.debugLevel>=2){Array.prototype.unshift.apply(arguments,["debug"]);_log.apply(this,arguments)}},logInfo:function(){if(this.options.debugLevel>=1){Array.prototype.unshift.apply(arguments,["info"]);_log.apply(this,arguments)}},logWarning:function(){Array.prototype.unshift.apply(arguments,["warn"]);_log.apply(this,arguments)},isInitializing:function(){return this.phase==

data/templates/ical/jquery.ical.js

@@ -3914,7 +3914,7 @@ AnyTime.utcLabel[840]=[
 
 /**
  * @preserve
- * FullCalendar v1.4.10
+ * FullCalendar v1.4.11
  * http://arshaw.com/fullcalendar/
  *
  * Use fullcalendar.css for basic styling.
@@ -3925,7 +3925,7 @@ AnyTime.utcLabel[840]=[
  * Dual licensed under the MIT and GPL licenses, located in
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
  *
- * Date: Sat Jan 1 23:46:27 2011 -0800
+ * Date: Tue Feb 22 21:47:22 2011 -0800
  *
  */
  
@@ -4025,7 +4025,7 @@ var rtlDefaults = {
 
 
 
-var fc = $.fullCalendar = { version: "1.4.10" };
+var fc = $.fullCalendar = { version: "1.4.11" };
 var fcViews = fc.views = {};
 
 
@@ -4103,6 +4103,7 @@ function Calendar(element, options, eventSources) {
 	t.refetchEvents = refetchEvents;
 	t.reportEvents = reportEvents;
 	t.reportEventChange = reportEventChange;
+	t.rerenderEvents = rerenderEvents;
 	t.changeView = changeView;
 	t.select = select;
 	t.unselect = unselect;
@@ -6899,6 +6900,7 @@ function AgendaEventRenderer() {
 	function draggableDayEvent(event, eventElement, isStart) {
 		if (!opt('disableDragging') && eventElement.draggable) {
 			var origWidth;
+			var revert;
 			var allDay=true;
 			var dayDelta;
 			var dis = opt('isRTL') ? -1 : 1;
@@ -6915,9 +6917,9 @@ function AgendaEventRenderer() {
 					hideEvents(event, eventElement);
 					origWidth = eventElement.width();
 					hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
-						eventElement.draggable('option', 'revert', !cell || !rowDelta && !colDelta);
 						clearOverlays();
 						if (cell) {
+							revert = false;
 							dayDelta = colDelta * dis;
 							if (!cell.row) {
 								// on full-days
@@ -6928,27 +6930,43 @@ function AgendaEventRenderer() {
 								resetElement();
 							}else{
 								// mouse is over bottom slots
-								if (isStart && allDay) {
-									// convert event to temporary slot-event
-									setOuterHeight(
-										eventElement.width(colWidth - 10), // don't use entire width
-										slotHeight * Math.round(
-											(event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes'))
-											/ opt('slotMinutes')
-										)
-									);
-									eventElement.draggable('option', 'grid', [colWidth, 1]);
-									allDay = false;
+								if (isStart) {
+									if (allDay) {
+										// convert event to temporary slot-event
+										eventElement.width(colWidth - 10); // don't use entire width
+										setOuterHeight(
+											eventElement,
+											slotHeight * Math.round(
+												(event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes'))
+												/ opt('slotMinutes')
+											)
+										);
+										eventElement.draggable('option', 'grid', [colWidth, 1]);
+										allDay = false;
+									}
+								}else{
+									revert = true;
 								}
 							}
+							revert = revert || (allDay && !dayDelta);
+						}else{
+							revert = true;
 						}
+						eventElement.draggable('option', 'revert', revert);
 					}, ev, 'drag');
 				},
 				stop: function(ev, ui) {
-					var cell = hoverListener.stop();
+					hoverListener.stop();
 					clearOverlays();
 					trigger('eventDragStop', eventElement, event, ev, ui);
-					if (cell && (!allDay || dayDelta)) {
+					if (revert) {
+						// hasn't moved or is out of bounds (draggable has already reverted)
+						resetElement();
+						if ($.browser.msie) {
+							eventElement.css('filter', ''); // clear IE opacity side-effects
+						}
+						showEvents(event, eventElement);
+					}else{
 						// changed!
 						eventElement.find('a').removeAttr('href'); // prevents safari from visiting the link
 						var minuteDelta = 0;
@@ -6959,13 +6977,6 @@ function AgendaEventRenderer() {
 								- (event.start.getHours() * 60 + event.start.getMinutes());
 						}
 						eventDrop(this, event, dayDelta, minuteDelta, allDay, ev, ui);
-					}else{
-						// hasn't moved or is out of bounds (draggable has already reverted)
-						resetElement();
-						if ($.browser.msie) {
-							eventElement.css('filter', ''); // clear IE opacity side-effects
-						}
-						showEvents(event, eventElement);
 					}
 				}
 			});
@@ -8721,4 +8732,75 @@ function enableTextSelection(element) {
 
 
 
-})(jQuery);
+})(jQuery);
+
+/*
+ * FullCalendar v1.4.11 Google Calendar Extension
+ *
+ * Copyright (c) 2010 Adam Shaw
+ * Dual licensed under the MIT and GPL licenses, located in
+ * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ *
+ * Date: Tue Feb 22 21:47:22 2011 -0800
+ *
+ */
+
+(function($) {
+
+	$.fullCalendar.gcalFeed = function(feedUrl, options) {
+		
+		feedUrl = feedUrl.replace(/\/basic$/, '/full');
+		options = options || {};
+		
+		return function(start, end, callback) {
+			var params = {
+				'start-min': $.fullCalendar.formatDate(start, 'u'),
+				'start-max': $.fullCalendar.formatDate(end, 'u'),
+				'singleevents': true,
+				'max-results': 9999
+			};
+			var ctz = options.currentTimezone;
+			if (ctz) {
+				params.ctz = ctz = ctz.replace(' ', '_');
+			}
+			$.getJSON(feedUrl + "?alt=json-in-script&callback=?", params, function(data) {
+				var events = [];
+				if (data.feed.entry) {
+					$.each(data.feed.entry, function(i, entry) {
+						var startStr = entry['gd$when'][0]['startTime'],
+							start = $.fullCalendar.parseISO8601(startStr, true),
+							end = $.fullCalendar.parseISO8601(entry['gd$when'][0]['endTime'], true),
+							allDay = startStr.indexOf('T') == -1,
+							url;
+						$.each(entry.link, function() {
+							if (this.type == 'text/html') {
+								url = this.href;
+								if (ctz) {
+									url += (url.indexOf('?') == -1 ? '?' : '&') + 'ctz=' + ctz;
+								}
+							}
+						});
+						if (allDay) {
+							$.fullCalendar.addDays(end, -1); // make inclusive
+						}
+						events.push({
+							id: entry['gCal$uid']['value'],
+							title: entry['title']['$t'],
+							url: url,
+							start: start,
+							end: end,
+							allDay: allDay,
+							location: entry['gd$where'][0]['valueString'],
+							description: entry['content']['$t'],
+							className: options.className,
+							editable: options.editable || false
+						});
+					});
+				}
+				callback(events);
+			});
+		}
+		
+	}
+
+})(jQuery);