Merge commit 'upstream/master'

38 files changed, 59 insertions, 1 deletions

diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl
index 09fd8da3d..47046c371 100644
--- a/view/theme/diabook-red/comment_item.tpl
+++ b/view/theme/diabook-red/comment_item.tpl
@@ -11,7 +11,7 @@
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
 				<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>	
 				<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
 				<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>														
diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
index c47bfbda5..c47bfbda5 100755..100644
--- a/view/theme/diabook-red/communityhome.tpl
+++ b/view/theme/diabook-red/communityhome.tpl
diff --git a/view/theme/diabook-red/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl
index 48930b48a..48930b48a 100755..100644
--- a/view/theme/diabook-red/contact_template.tpl
+++ b/view/theme/diabook-red/contact_template.tpl
diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl
index db1936e4b..db1936e4b 100755..100644
--- a/view/theme/diabook-red/directory_item.tpl
+++ b/view/theme/diabook-red/directory_item.tpl
diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js
index d183c7573..d183c7573 100755..100644
--- a/view/theme/diabook-red/fpostit/fpostit.js
+++ b/view/theme/diabook-red/fpostit/fpostit.js
diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl
index 642019049..642019049 100755..100644
--- a/view/theme/diabook-red/group_side.tpl
+++ b/view/theme/diabook-red/group_side.tpl
diff --git a/view/theme/diabook-red/icons/attach.png b/view/theme/diabook-red/icons/attach.png
index 1958041cf..1958041cf 100755..100644
--- a/view/theme/diabook-red/icons/attach.png
+++ b/view/theme/diabook-red/icons/attach.png
diff --git a/view/theme/diabook-red/icons/audio.png b/view/theme/diabook-red/icons/audio.png
index 8d779a409..8d779a409 100755..100644
--- a/view/theme/diabook-red/icons/audio.png
+++ b/view/theme/diabook-red/icons/audio.png
diff --git a/view/theme/diabook-red/icons/camera.png b/view/theme/diabook-red/icons/camera.png
index a5c7f1236..a5c7f1236 100755..100644
--- a/view/theme/diabook-red/icons/camera.png
+++ b/view/theme/diabook-red/icons/camera.png
diff --git a/view/theme/diabook-red/icons/close_box.png b/view/theme/diabook-red/icons/close_box.png
index 28e2675b8..28e2675b8 100755..100644
--- a/view/theme/diabook-red/icons/close_box.png
+++ b/view/theme/diabook-red/icons/close_box.png
diff --git a/view/theme/diabook-red/icons/contacts.png b/view/theme/diabook-red/icons/contacts.png
index 20c990c84..20c990c84 100755..100644
--- a/view/theme/diabook-red/icons/contacts.png
+++ b/view/theme/diabook-red/icons/contacts.png
diff --git a/view/theme/diabook-red/icons/contacts2.png b/view/theme/diabook-red/icons/contacts2.png
index 7817279f4..7817279f4 100755..100644
--- a/view/theme/diabook-red/icons/contacts2.png
+++ b/view/theme/diabook-red/icons/contacts2.png
diff --git a/view/theme/diabook-red/icons/drop.png b/view/theme/diabook-red/icons/drop.png
index 2abb82ef2..2abb82ef2 100755..100644
--- a/view/theme/diabook-red/icons/drop.png
+++ b/view/theme/diabook-red/icons/drop.png
diff --git a/view/theme/diabook-red/icons/file_as.png b/view/theme/diabook-red/icons/file_as.png
index 16713fa53..16713fa53 100755..100644
--- a/view/theme/diabook-red/icons/file_as.png
+++ b/view/theme/diabook-red/icons/file_as.png
diff --git a/view/theme/diabook-red/icons/link.png b/view/theme/diabook-red/icons/link.png
index 0ef666a67..0ef666a67 100755..100644
--- a/view/theme/diabook-red/icons/link.png
+++ b/view/theme/diabook-red/icons/link.png
diff --git a/view/theme/diabook-red/icons/lock.png b/view/theme/diabook-red/icons/lock.png
index 7e34bf279..7e34bf279 100755..100644
--- a/view/theme/diabook-red/icons/lock.png
+++ b/view/theme/diabook-red/icons/lock.png
diff --git a/view/theme/diabook-red/icons/lupe.png b/view/theme/diabook-red/icons/lupe.png
index f8b228347..f8b228347 100755..100644
--- a/view/theme/diabook-red/icons/lupe.png
+++ b/view/theme/diabook-red/icons/lupe.png
diff --git a/view/theme/diabook-red/icons/next.png b/view/theme/diabook-red/icons/next.png
index 7b5e25b90..7b5e25b90 100755..100644
--- a/view/theme/diabook-red/icons/next.png
+++ b/view/theme/diabook-red/icons/next.png
diff --git a/view/theme/diabook-red/icons/notifications.png b/view/theme/diabook-red/icons/notifications.png
index 97e5c311c..97e5c311c 100755..100644
--- a/view/theme/diabook-red/icons/notifications.png
+++ b/view/theme/diabook-red/icons/notifications.png
diff --git a/view/theme/diabook-red/icons/pencil.png b/view/theme/diabook-red/icons/pencil.png
index 772e49b17..772e49b17 100755..100644
--- a/view/theme/diabook-red/icons/pencil.png
+++ b/view/theme/diabook-red/icons/pencil.png
diff --git a/view/theme/diabook-red/icons/photo-menu.jpg b/view/theme/diabook-red/icons/photo-menu.jpg
index fde5eb535..fde5eb535 100755..100644
--- a/view/theme/diabook-red/icons/photo-menu.jpg
+++ b/view/theme/diabook-red/icons/photo-menu.jpg
diff --git a/view/theme/diabook-red/icons/prev.png b/view/theme/diabook-red/icons/prev.png
index 55c1464ba..55c1464ba 100755..100644
--- a/view/theme/diabook-red/icons/prev.png
+++ b/view/theme/diabook-red/icons/prev.png
diff --git a/view/theme/diabook-red/icons/recycle.png b/view/theme/diabook-red/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100755..100644
--- a/view/theme/diabook-red/icons/recycle.png
+++ b/view/theme/diabook-red/icons/recycle.png
diff --git a/view/theme/diabook-red/icons/remote.png b/view/theme/diabook-red/icons/remote.png
index a560cc55e..a560cc55e 100755..100644
--- a/view/theme/diabook-red/icons/remote.png
+++ b/view/theme/diabook-red/icons/remote.png
diff --git a/view/theme/diabook-red/icons/scroll_top.png b/view/theme/diabook-red/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100755..100644
--- a/view/theme/diabook-red/icons/scroll_top.png
+++ b/view/theme/diabook-red/icons/scroll_top.png
diff --git a/view/theme/diabook-red/icons/star.png b/view/theme/diabook-red/icons/star.png
index 0b00cb189..0b00cb189 100755..100644
--- a/view/theme/diabook-red/icons/star.png
+++ b/view/theme/diabook-red/icons/star.png
diff --git a/view/theme/diabook-red/icons/starred.png b/view/theme/diabook-red/icons/starred.png
index 2b82dfca3..2b82dfca3 100755..100644
--- a/view/theme/diabook-red/icons/starred.png
+++ b/view/theme/diabook-red/icons/starred.png
diff --git a/view/theme/diabook-red/icons/tagged.png b/view/theme/diabook-red/icons/tagged.png
index 144649ef8..144649ef8 100755..100644
--- a/view/theme/diabook-red/icons/tagged.png
+++ b/view/theme/diabook-red/icons/tagged.png
diff --git a/view/theme/diabook-red/icons/unlock.png b/view/theme/diabook-red/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100755..100644
--- a/view/theme/diabook-red/icons/unlock.png
+++ b/view/theme/diabook-red/icons/unlock.png
diff --git a/view/theme/diabook-red/icons/unstarred.png b/view/theme/diabook-red/icons/unstarred.png
index ba3183f5c..ba3183f5c 100755..100644
--- a/view/theme/diabook-red/icons/unstarred.png
+++ b/view/theme/diabook-red/icons/unstarred.png
diff --git a/view/theme/diabook-red/icons/video.png b/view/theme/diabook-red/icons/video.png
index a03d1d818..a03d1d818 100755..100644
--- a/view/theme/diabook-red/icons/video.png
+++ b/view/theme/diabook-red/icons/video.png
diff --git a/view/theme/diabook-red/icons/weblink.png b/view/theme/diabook-red/icons/weblink.png
index 216e78344..216e78344 100755..100644
--- a/view/theme/diabook-red/icons/weblink.png
+++ b/view/theme/diabook-red/icons/weblink.png
diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl
index bd43994b5..bd43994b5 100755..100644
--- a/view/theme/diabook-red/jot.tpl
+++ b/view/theme/diabook-red/jot.tpl
diff --git a/view/theme/diabook-red/js/jquery.autogrow.textarea.js b/view/theme/diabook-red/js/jquery.autogrow.textarea.js
new file mode 100644
index 000000000..806e34f51
--- /dev/null
+++ b/view/theme/diabook-red/js/jquery.autogrow.textarea.js
@@ -0,0 +1,46 @@
+(function($) {
+
+    /*
+     * Auto-growing textareas; technique ripped from Facebook
+     */
+    $.fn.autogrow = function(options) {
+        
+        this.filter('textarea').each(function() {
+            
+            var $this       = $(this),
+                minHeight   = $this.height(),
+                lineHeight  = $this.css('lineHeight');
+            
+            var shadow = $('<div></div>').css({
+                position:   'absolute',
+                top:        -10000,
+                left:       -10000,
+                width:      $(this).width(),
+                fontSize:   $this.css('fontSize'),
+                fontFamily: $this.css('fontFamily'),
+                lineHeight: $this.css('lineHeight'),
+                resize:     'none'
+            }).appendTo(document.body);
+            
+            var update = function() {
+                
+                var val = this.value.replace(/</g, '&lt;')
+                                    .replace(/>/g, '&gt;')
+                                    .replace(/&/g, '&amp;')
+                                    .replace(/\n/g, '<br/>');
+                
+                shadow.html(val);
+                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
+            }
+            
+            $(this).change(update).keyup(update).keydown(update);
+            
+            update.apply(this);
+            
+        });
+        
+        return this;
+        
+    }
+    
+})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl
index 989f17878..989f17878 100755..100644
--- a/view/theme/diabook-red/mail_conv.tpl
+++ b/view/theme/diabook-red/mail_conv.tpl
diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl
index 09dfb2aae..09dfb2aae 100755..100644
--- a/view/theme/diabook-red/photo_view.tpl
+++ b/view/theme/diabook-red/photo_view.tpl
diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl
index 123834064..123834064 100755..100644
--- a/view/theme/diabook-red/search_item.tpl
+++ b/view/theme/diabook-red/search_item.tpl
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index c7fa77985..479a0130a 100755..100644
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -289,6 +289,9 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
 $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.ae.image.resize.js";
 $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
 
+//load jquery.autogrow-textarea.js
+$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.autogrow.textarea.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
 
 //js scripts
 //comment-edit-wrapper on photo_view
@@ -313,6 +316,15 @@ $a->page['htmlhead'] .= '
  });
   
  </script>';
+ 
+$a->page['htmlhead'] .= '
+
+<script type="text/javascript">
+
+function tautogrow(id){
+		$("textarea#comment-edit-text-" +id).autogrow(); 	
+ 	};
+ </script>';
 
 $a->page['htmlhead'] .= '
  <script>