Merge pull request #445 from fermionic/frost-scrollbars-are-annoying

Frost scrollbars are annoying

include/oembed.php

@@ -116,7 +116,7 @@ function oembed_format_object($j){
 		if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
 	} else {
 		// add <a> for html2bbcode conversion
-		$ret .= "<a href='$embedurl' rel='oembed'/>";
+		$ret .= "<a href='$embedurl' rel='oembed'></a>";
 	}
 	$ret.="<br style='clear:left'></span>";
 	return  mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));

view/theme/frost-mobile/end.tpl

@@ -7,6 +7,7 @@
 </script>-->
 <script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
 <script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="$baseurl/view/theme/frost/js/jquery.divgrow-1.3.1.min.js" ></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
 <!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>-->

view/theme/frost-mobile/js/jquery.divgrow-1.3.1.min.js

@@ -0,0 +1 @@
+(function ($) { var divgrowid = 0; $.fn.divgrow = function (options) { var options = $.extend({}, { initialHeight: 100, moreText: "+ Show More", lessText: "- Show Less", speed: 1000, showBrackets: true }, options); return this.each(function () { divgrowid++; obj = $(this); var fullHeight = obj.height() + 10; obj.css('height', options.initialHeight).css('overflow', 'hidden'); if (options.showBrackets) { obj.after('<p class="divgrow-brackets">[&hellip;]</p><a href="#" class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></a>') } else { obj.after('<a href="#" class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></a>') } $("a.divgrow-showmore").html(options.moreText); $("." + "divgrow-obj-" + divgrowid).toggle(function () { $(this).prevAll("div:first").animate({ height: fullHeight + "px" }, options.speed, function () { if (options.showBrackets) { $(this).nextAll("p.divgrow-brackets:first").fadeOut() } $(this).nextAll("a.divgrow-showmore:first").html(options.lessText) }) }, function () { $(this).prevAll("div:first").stop(true, false).animate({ height: options.initialHeight }, options.speed, function () { if (options.showBrackets) { $(this).nextAll("p.divgrow-brackets:first").stop(true, false).fadeIn() } $(this).nextAll("a.divgrow-showmore:first").stop(true, false).html(options.moreText) }) }) }) } })(jQuery);

view/theme/frost-mobile/js/main.js

@@ -349,6 +349,33 @@
 			}
 			/* autocomplete @nicknames */
 			$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+
+			var bimgs = $j(".wall-item-body > img").not(function() { return this.complete; });
+			var bimgcount = bimgs.length;
+
+			if (bimgcount) {
+				bimgs.load(function() {
+					bimgcount--;
+					if (! bimgcount) {
+						collapseHeight();
+
+					}
+				});
+			} else {
+				collapseHeight();
+			}
+
+		});
+	}
+
+	function collapseHeight() {
+		$j(".wall-item-body").each(function() {
+				if($j(this).height() > 310) {
+				if(! $j(this).hasClass('divmore')) {
+					$j(this).divgrow({ initialHeight: 300, showBrackets: false, speed: 300 });
+					$j(this).addClass('divmore');
+				}
+			}					
 		});
 	}
 

view/theme/frost-mobile/theme.php

@@ -4,7 +4,7 @@
  * Name: Frost--mobile version
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.2.8
+ * Version: Version 0.2.9
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */

view/theme/frost/end.tpl

@@ -7,6 +7,7 @@
 </script>
 <script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
 <script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="$baseurl/view/theme/frost/js/jquery.divgrow-1.3.1.min.js" ></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost/js/fk.autocomplete.min.js" ></script>
 <script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>

view/theme/frost/js/jquery.divgrow-1.3.1.min.js

@@ -0,0 +1 @@
+(function ($) { var divgrowid = 0; $.fn.divgrow = function (options) { var options = $.extend({}, { initialHeight: 100, moreText: "+ Show More", lessText: "- Show Less", speed: 1000, showBrackets: true }, options); return this.each(function () { divgrowid++; obj = $(this); var fullHeight = obj.height() + 10; obj.css('height', options.initialHeight).css('overflow', 'hidden'); if (options.showBrackets) { obj.after('<p class="divgrow-brackets">[&hellip;]</p><a href="#" class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></a>') } else { obj.after('<a href="#" class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></a>') } $("a.divgrow-showmore").html(options.moreText); $("." + "divgrow-obj-" + divgrowid).toggle(function () { $(this).prevAll("div:first").animate({ height: fullHeight + "px" }, options.speed, function () { if (options.showBrackets) { $(this).nextAll("p.divgrow-brackets:first").fadeOut() } $(this).nextAll("a.divgrow-showmore:first").html(options.lessText) }) }, function () { $(this).prevAll("div:first").stop(true, false).animate({ height: options.initialHeight }, options.speed, function () { if (options.showBrackets) { $(this).nextAll("p.divgrow-brackets:first").stop(true, false).fadeIn() } $(this).nextAll("a.divgrow-showmore:first").stop(true, false).html(options.moreText) }) }) }) } })(jQuery);

view/theme/frost/js/main.js

@@ -342,6 +342,33 @@
 			}
 			/* autocomplete @nicknames */
 			$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
+
+			var bimgs = $j(".wall-item-body > img").not(function() { return this.complete; });
+			var bimgcount = bimgs.length;
+
+			if (bimgcount) {
+				bimgs.load(function() {
+					bimgcount--;
+					if (! bimgcount) {
+						collapseHeight();
+
+					}
+				});
+			} else {
+				collapseHeight();
+			}
+
+		});
+	}
+
+	function collapseHeight() {
+		$j(".wall-item-body").each(function() {
+				if($j(this).height() > 410) {
+				if(! $j(this).hasClass('divmore')) {
+					$j(this).divgrow({ initialHeight: 400, showBrackets: false, speed: 300 });
+					$j(this).addClass('divmore');
+				}
+			}					
 		});
 	}
 

view/theme/frost/style.css

@@ -1296,7 +1296,7 @@ input#dfrn-url {
 .wall-item-content {
 	margin-left: 10px;
 	padding-right: 1em;
-	max-height: 500px;
+/*	max-height: 500px;*/
 	overflow: auto;
 }
 

view/theme/frost/theme.php

@@ -4,7 +4,7 @@
  * Name: Frost
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.2.6
+ * Version: Version 0.2.7
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
@@ -21,4 +21,7 @@ function frost_init(&$a) {
 	if( $a->module === 'login' )
 		$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>';
 
+	$a->videowidth = 400;
+	$a->videoheight = 330;
+
 }