aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/Photo.php2
-rw-r--r--js/main.js69
-rw-r--r--version.inc2
-rw-r--r--view/theme/duepuntozero/style.css5
4 files changed, 38 insertions, 40 deletions
diff --git a/include/Photo.php b/include/Photo.php
index 1044155b5..e870a2507 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -545,7 +545,7 @@ class Photo {
else {
$r = q("INSERT INTO `photo`
( `uid`, `contact-id`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
- VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
+ VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
intval($uid),
intval($cid),
dbesc($rid),
diff --git a/js/main.js b/js/main.js
index 47ce61704..29af7eb59 100644
--- a/js/main.js
+++ b/js/main.js
@@ -260,6 +260,10 @@ function updateConvItems(mode,data) {
}
if(mode === 'replace') {
// clear existing content
+ $('.thread-wrapper').remove();
+
+ prev = 'threads-begin';
+
$('.thread-wrapper',data).each(function() {
var ident = $(this).attr('id');
@@ -677,42 +681,6 @@ function previewTheme(elm) {
}
-// This can be used for dynamic "show more" based purely on the
-// height of the enclosed HTML (which has overflow: hidden).
-// if ($(el).vScrollable()) {
-// show_more_link(el);
-// }
-// when link is clicked do $(el).css('overflow','visible')
-//
-// We do this by cloning the element in question but in a hidden div which displays overflow content and compare the heights
-// of the two elements. Then we remove the hidden div we just created.
-
-(function($) {
- $.fn.vScrollable = function() {
- return this.each(function() {
- var el = $(this);
- var tooHigh = false;
-
- if(el.css("overflow") == "hidden") {
- var text = el.html();
- var t = $(this.cloneNode(true))
- .hide()
- .css('position', 'absolute')
- .css('overflow', 'visible')
- .width(el.width())
- .height('auto')
- ;
- el.after(t);
- tooHigh = (t.height() > el.height());
- el.parentNode.removeChild(el);
- }
- return tooHigh;
- });
- };
-})(jQuery);
-
-
-
$(document).ready(function() {
jQuery.timeago.settings.strings = {
@@ -735,6 +703,35 @@ jQuery.timeago.settings.strings = {
numbers: tago17
};
+//$('.wall-item-content').each(function() {
+
+// var totalHeight = 0;
+// $(this).children().each(function(){
+// totalHeight += $(this).outerHeight(true); // true = include margins
+// });
+// if(totalHeight > 400) {
+// $(this).css({'overflow-y':'hidden','max-height' : '400px'});
+
+// }
+// else {
+// $(this).css('overflow-y','visible');
+// }
+// });
+
+
+$('.wall-item-content').css({'overflow-y':'hidden','max-height' : '400px'});
+
+$('.wall-item-content').focus(
+ function() {
+ $(this).css('overflow-y','visible')
+ });
+
+$('.wall-item-content').focusout(
+ function() {
+ $(this).css( { 'overflow-y' : 'hidden','max-height' : '400px'});
+ }
+);
+
$("abbr.wall-item-ago-time").timeago();
}); \ No newline at end of file
diff --git a/version.inc b/version.inc
index 19ce7d04b..00693714b 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-07-23.24
+2012-07-24.25
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 34b57555c..3b2b8475d 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1124,8 +1124,9 @@ input#dfrn-url {
margin-left: 10px;
/*margin-bottom: 20px;*/
/*padding: 20px;*/
- max-height: 400px;
- overflow: auto;
+/* max-height: 400px; */
+/* overflow-x: auto; */
+/* overflow-y: auto; */
}
.wall-item-content img {