[5115] makaanga/0.x/htdocs: Makaanga. Merge r5113 in preparation for 0.7.1.
0 views
Skip to first unread message
s...@habariproject.org
May 7, 2011, 9:51:53 PM5/7/11
to habar...@googlegroups.com
- Revision
- 5115
- Author
- michaeltwofish
- Date
- 2011-05-08 01:51:50 +0000 (Sun, 08 May 2011)
Log Message
Makaanga. Merge r5113 in preparation for 0.7.1.
Modified Paths
Property Changed
Diff
Property changes: makaanga/0.x/htdocs
Modified: svn:mergeinfo
Property changes: makaanga/0.x/htdocs/LICENCE
Modified: svn:mergeinfo
Property changes: makaanga/0.x/htdocs/NOTICE
Modified: svn:mergeinfo
Property changes: makaanga/0.x/htdocs/index.php
Modified: svn:mergeinfo
Property changes: makaanga/0.x/htdocs/system
Modified: svn:mergeinfo
Modified: makaanga/0.x/htdocs/system/admin/js/media.js (5114 => 5115)
--- makaanga/0.x/htdocs/system/admin/js/media.js 2011-05-07 23:55:27 UTC (rev 5114)
+++ makaanga/0.x/htdocs/system/admin/js/media.js 2011-05-08 01:51:50 UTC (rev 5115)
@@ -94,7 +94,7 @@
// if ($('.mediaphotos .media', container).length == 0 && $('.media_dirlevel:first-child li.active', container).length == 0) {
// $('.media_dirlevel:last-child li:first-child', container).click();
// }
-
+
$('.media img').addClass('loading');
// As each image loads
@@ -113,8 +113,10 @@
},
resize_media_row: function() {
+ // Obtain the silo id we're working in so we can resize the correct silo's media_row
+ var silo_id = $('.mediasplitter:not(".ui-tabs-hide")').attr('id');
var dirswidth = 0;
- $('.media_dirlevel').each(function(){
+ $('#' + silo_id +' .media_dirlevel').each(function(){
var maxw = 0;
$(this).find('.directory').each(function(){
maxw = Math.max(maxw, $(this).outerWidth());
@@ -122,8 +124,7 @@
$(this).width(maxw);
dirswidth += maxw;
});
- $('.media_row').width(dirswidth + $('.mediaphotos').outerWidth() + 33);
-
+ $('#' + silo_id +' .media_row').width(dirswidth + $('#' + silo_id +' .mediaphotos').outerWidth() + 33);
},
clickdir: function(el, path) {
Property changes: makaanga/0.x/htdocs/system/plugins/coreblocks
Modified: svn:mergeinfo
Property changes: makaanga/0.x/htdocs/system/vendor
Modified: svn:mergeinfo
Property changes: makaanga/0.x/htdocs/system/vendor/jquery.js
Modified: svn:mergeinfo
Property changes: makaanga/0.x/htdocs/user
Modified: svn:mergeinfo
Reply all
Reply to author
Forward
0 new messages