Commit 507bd04d authored by Rene AJM Veerman's avatar Rene AJM Veerman

jQuery-File-Upload-*-SA now uses vividScrollpane (but isn't tied to it), for…

jQuery-File-Upload-*-SA now uses vividScrollpane (but isn't tied to it), for smoother prettier scrolling that in the (near-)future can track a large upload using automated scrolling
parent d6d723fc
......@@ -38,7 +38,6 @@ saTree = sa.tree = sa.t = {
sa.tree.db[sa.tree.db.length] = result.rows[i].doc;
};
debugger;
if (typeof callback2=='function') callback2();
}).catch (function (err) {
debugger; console.log (err);
......@@ -389,7 +388,6 @@ saTree = sa.tree = sa.t = {
activate_node__gotoNewNode : function (node) {
debugger;
if (sa.tree.settings.current.node) sa.tree.save_node(sa.tree.settings.current.node);
// switch to new node
......@@ -542,6 +540,12 @@ saTree = sa.tree = sa.t = {
jQuery('#jQueryFileUpload').css ({
height : max
});
jQuery('#jQueryFileUpload__scrollpane__container, #jQueryFileUpload__scrollpane iframe').css({ height : max });
jQuery('#jQueryFileUpload__scrollpane').css ({height:'auto'});
sa.sp.containerSizeChanged (jQuery('#jQueryFileUpload__scrollpane')[0], true);
sa.sp.bindEvents(jQuery('#jQueryFileUpload__scrollpane')[0]);
}, 500);
for (var idx in sa.tree.db) {
......
......@@ -11,5 +11,5 @@
*/
body {
padding-top: 60px;
NOpadding-top: 60px;
}
......@@ -43,8 +43,8 @@ require_once (dirname(__FILE__).'/../../../boot_stage_001.php');
<noscript><link rel="stylesheet" href="css/jquery.fileupload-noscript.css"></noscript>
<noscript><link rel="stylesheet" href="css/jquery.fileupload-ui-noscript.css"></noscript>
</head>
<body style="background:none transparent;">
<div class="container">
<body style="background:none transparent;overflow:hidden">
<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 -->
......
......@@ -618,8 +618,8 @@ seductiveapps.misc = sa.misc = seductiveapps.m = sa.m = {
if (add) {
if (el.addEventListener) {
//el.addEventListener ('scroll', handler, true);
el.addEventListener ('DOMMouseScroll', handler, true);
el.addEventListener ('mousewheel', handler, true);
var r = el.addEventListener ('DOMMouseScroll', handler, true);
var r = el.addEventListener ('mousewheel', handler, true);
} else {
el.onmousewheel = handler;
}
......
......@@ -57,6 +57,16 @@ seductiveapps.desktop = {
width : jQuery('#siteManager__td__treeview').width(),
height : jQuery('#siteManager__td__treeview').height()
});
jQuery('#siteManager > table').css({
width : jQuery('#siteManager').width(),
height : jQuery('#siteManager').height()
});
jQuery('#jQueryFileUpload__scrollpane__container, #jQueryFileUpload__scrollpane, #jQueryFileUpload').css({
width : jQuery('#siteManager__uploader_tab').width(),
height : jQuery('#siteManager__uploader_tab').height()
});
sa.sp.containerSizeChanged (jQuery('#jQueryFileUpload__scrollpane')[0], true);
sa.sp.bindEvents(jQuery('#jQueryFileUpload__scrollpane')[0]);
},
done : function () {
sa.vcc.applyTheme ('siteManager');
......@@ -64,6 +74,26 @@ seductiveapps.desktop = {
width : jQuery('#siteManager__td__treeview').width(),
height : jQuery('#siteManager__td__treeview').height()
});
var x1 = jQuery('.preview', jQuery('#jQueryFileUpload')[0].contentWindow.document.body).css ('display');
if (typeof x1 =='string' && x1 !== '' && x1 !== 'none') var x = x1;
if (typeof x == 'string' && x !== '') jQuery('.preview', jQuery('#jQueryFileUpload')[0].contentWindow.document.body).css ({display:'none'});
jQuery('#siteManager > table').css({
width : jQuery('#siteManager').width(),
height : jQuery('#siteManager').height()
});
jQuery('#siteManager__td__content, .siteManager__tab').css ({
width : jQuery('#siteManager').width() * 0.75,
height : '100%'
});
setTimeout (function () {
jQuery('#jQueryFileUpload__scrollpane__container, #jQueryFileUpload__scrollpane, #jQueryFileUpload').css({
width : jQuery('#siteManager__uploader_tab').width(),
height : jQuery('#siteManager__uploader_tab').height()
});
sa.sp.containerSizeChanged (jQuery('#jQueryFileUpload__scrollpane')[0], true);
if (typeof x == 'string' && x !== '') jQuery('.preview', jQuery('#jQueryFileUpload')[0].contentWindow.document.body).css ({display:x});
sa.sp.bindEvents(jQuery('#jQueryFileUpload__scrollpane')[0]);
}, 100);
}
});
}
......
......@@ -164,7 +164,7 @@
<div id="siteManager" class="vividDialog {$saPageSettings__siteMedia__vividTheme} vividScrollpane__hidden" style="position:absolute;display:none;color:white;left:10px;width:700px;height:500px;top:-510px;z-index:15000;">
<table style="width:100%;height:100%;">
<tr>
<td id="siteManager__td__treeview" style="width:25%;">
<td id="siteManager__td__treeview" style="width:25%;height:100%;">
<div id="siteManager__treeview" style="width:100%;height:100%;border:1px solid black;border-radius:7px;">
<div id="siteManager__treeview__background" style="position:absolute;;width:25%;height:100%;border-radius:7px;background:navy;opacity:0.5;z-index:-1;"></div>
<div id="siteMedia__treeview__controls" style="width:100%;height:45px;padding:10px;">
......@@ -179,7 +179,7 @@
</div>
</div>
</td>
<td>
<td id="siteManager__td__content" style="width:75%;height:100%;">
<div id="siteManager__tinymce_tab" class="siteManager__tab" style="width:100%;height:100%">
<table id="siteManager__tinymce_tab_header" style="width:100%;">
<tr>
......@@ -206,7 +206,7 @@
<td style="vertical-align:middle;"><input id="siteManager__title__uploader" name="siteManager__title__uploader" style="width:100%;opacity:0.7;background:navy;color:white;"></input></td>
</tr>
</table>
<iframe id="jQueryFileUpload" src="" style="width:100%;height:100%" allowtransparency="true"></iframe>
<div id="jQueryFileUpload__scrollpane" class="vividScrollpane vividTheme__scroll_black"><iframe id="jQueryFileUpload" src="" style="width:100%;height:100%" allowtransparency="true"></iframe></div>
</div>
</td>
</tr>
......
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