Commit 8e0b8da6 authored by Rene AJM Veerman's avatar Rene AJM Veerman

added vividScrollpane to /media (photo album views) - have no idea why the...

added vividScrollpane to /media (photo album views) - have no idea why the mousewheel is so sluggish in that view. anyways, tomorrow, more vividScrollpane debugging (now that it can control an iframe)
parent 708368f6
......@@ -86,6 +86,12 @@ $relPath = $appParams['apps']['media']['user'].'/'.join ($paths, '/');
return sa.m.settings.initialized.site && !sa.desktop.settings.animating
}, function () {
jQuery('#siteContent').html('<iframe id="saMediaAlbum" src="<?php echo $saFrameworkFolder?>/lib/jQuery-File-Upload-9.21.0-SA/sa_iframe_noUploading.php?path=<?php echo $relPath?>" style="width:100%;height:100%;"></iframe>');
setTimeout(function() {
sa.vcc.settings['#siteContent__scrollpane'].containsIframe = true;
sa.sp.containerSizeChanged (jQuery('#siteContent')[0], true);
}, 500);
sa.desktop.resize();
jQuery('#saMediaAlbum').css({
width : jQuery('#siteContent__scrollpane').outerWidth(),
......
......@@ -44,7 +44,7 @@ require_once (dirname(__FILE__).'/../../../boot_stage_001.php');
<noscript><link rel="stylesheet" href="css/jquery.fileupload-ui-noscript.css"></noscript>
</head>
<body style="background:none transparent;">
<div class="container">
<div class="container-fluid">
<!-- The file upload form used as target for the file upload widget -->
<form id="fileupload" action="https://jquery-file-upload.appspot.com/" method="POST" enctype="multipart/form-data">
<!-- Redirect browsers with JavaScript disabled to the origin page -->
......
......@@ -514,7 +514,7 @@ seductiveapps.sp = seductiveapps.vividScrollpane = {
if (scrollpaneContainer) scrollpaneContainer.theme = t;
if (scrollpane) scrollpane.theme = t;
s.containsIframe = (scrollpane.childNodes[0].tagName ? scrollpane.childNodes[0].tagName.toLowerCase()=='iframe' : false);
s.containsIframe = jQuery('iframe', item.scrollpane);
if (s.containsIframe) {
s.cw = jQuery('iframe',item.scrollpane)[0].contentWindow;
s.sp = jQuery('iframe',item.scrollpane)[0].contentWindow.document.getElementsByTagName('body')[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment