Commit 0b86673b authored by ivan.ilyin's avatar ivan.ilyin

Merge branch 'master' of github.com:Sankore/Sankore-3.1

parents de832d01 93c88230
......@@ -68,7 +68,7 @@ function init(){
if(/<object/.test(embed)){
loadWindow.append(embed);
loadWindow.find("embed").attr("wmode","transparent");
loadWindow.find("embed").attr("wmode","opaque");
var loadWindow_content = loadWindow.html();
loadWindow.empty().html(loadWindow_content);
}
......
......@@ -100,7 +100,7 @@
function checkcontent(){
if($("#embeded-content").html().length != 0 && $("#embeded-content").children(":first").width() > 0){
$("#embeded-content embed").attr("wmode", "transparent");
$("#embeded-content embed").attr("wmode", "opaque");
var embeded_content_html = $("#embeded-content").html();
$("#embeded-content").empty().html(embeded_content_html);
......@@ -119,8 +119,6 @@
})
.width($("#embeded-content").children(":first").width())
.height($("#embeded-content").children(":first").height());
//alert(html);
//alert($("#embeded-content").children(":first").width() + " | " + $("#embeded-content").children(":first").height());
$("#container").removeClass("load").addClass("show");
$("#show-area").fadeIn(2000).css({
left:$("#embeded-content").children(":first").width()-25,
......@@ -160,9 +158,6 @@
var widgetWidth = $("#embeded-content").width() + margins.right + margins.left + adjustmentX;
var widgetHeight = $("#embeded-content").position().top + $("#embeded-content").height() + margins.bottom + adjustmentY;
//alert(widgetWidth + " | " + widgetHeight);
//window.resizeTo(widgetWidth, $(window).height());
window.resizeTo(widgetWidth, widgetHeight);
window.sankore.resize(widgetWidth, widgetHeight);
};
......@@ -171,15 +166,6 @@
return(parseInt(cssvalue.replace("px", "")));
};
/*if (window.widget) {
window.widget.onremove = function(){
//$("#show-inputfield-button").trigger("click");
$("#embeded-content")
.empty()
.oembed($("#textbox").val());
}
}*/
initialize();
});
</script>
......
......@@ -167,9 +167,11 @@
$("#web-browser").height($(window).height() - $("#toolbar").height() - 2);
$("#web-browser").width($(window).width() - 2);
if($(window).width() < 280){
window.resizeTo(280, $(window).height());
}
if($(window).width() < 370)
window.resizeTo(370, $(window).height());
if($(window).height() < 150)
window.resizeTo($(window).width(), 150);
});
......
......@@ -166,13 +166,16 @@
$(window).resize(function(){
if($(window).width() < 300){
window.resizeTo(300, $(window).height());
if($(window).width() < 370){
window.resizeTo(370, $(window).height());
} else if($(window).width() > 755){
$("#web-browser").height($(window).height() - $("#toolbar").height() - 2);
$("#web-browser").width($(window).width() - 2);
} else
$("#web-browser").height($(window).height() - $("#toolbar").height() - 2);
if($(window).height() < 150)
window.resizeTo($(window).width(), 150);
});
......
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