Skip to content

Preview resize 12319 (rebased onto develop) #2762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshmoore merged 2 commits into from
Jul 8, 2014
Merged

Preview resize 12319 (rebased onto develop) #2762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7592a44
Preview Viewport resizes to fit space. See #12319
will-moore Jun 10, 2014
ff93d0d
Don't reduce Preveiew viewport height below 300px
will-moore Jun 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions ...s/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_preview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,21 @@

<script type="text/javascript">
$(document).ready(function() {

// Fix size according to right panel size... NB: this behaviour is also in right_plugin.preview.js
var vpWidth = $("#right_panel").width() - 50,
vpHeight = Math.min(vpWidth, $("#preview_tab").height() - 100);
vpHeight = Math.max(300, vpHeight);
$("#viewport").css({'width': vpWidth + 'px', 'height': vpHeight + 'px'});

if (typeof OME === "undefined") {OME = {}}

{% if share_id %}
var viewport = $.WeblitzViewport($("#viewport"), "{% url 'webindex' %}{{ share_id }}", {'mediaroot': '{{ STATIC_URL }}' } );
viewport.load({{ manager.image.id }}, null, location.search);
OME.preview_viewport = $.WeblitzViewport($("#viewport"), "{% url 'webindex' %}{{ share_id }}", {'mediaroot': '{{ STATIC_URL }}' } );
OME.preview_viewport.load({{ manager.image.id }}, null, location.search);
{% else %}
var viewport = $.WeblitzViewport($("#viewport"), "{% url 'webindex' %}", {'mediaroot': '{{ STATIC_URL }}' } );
viewport.load({{ manager.image.id }});
OME.preview_viewport = $.WeblitzViewport($("#viewport"), "{% url 'webindex' %}", {'mediaroot': '{{ STATIC_URL }}' } );
OME.preview_viewport.load({{ manager.image.id }});
{% endif %}

var copy_paste_rdef_url = "{% url 'webgateway.views.copy_image_rdef_json' %}";
Expand Down
16 changes: 16 additions & 0 deletions ...meroWeb/omeroweb/webclient/templates/webclient/data/includes/right_plugin.preview.js.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,22 @@

$(document).ready(function() {

$("#right_panel").bind('resize', function(event) {

// This behaviour is also in the metatdata_preview.html itself
var vpWidth = $(this).width() - 50,
vpHeight = Math.min(vpWidth, $("#preview_tab").height() - 100);
vpHeight = Math.max(300, vpHeight);

if (OME.preview_viewport) {
// Need to set a few sizes, then call viewport.refresh()
$("#viewport").css({'width': vpWidth + 'px', 'height': vpHeight + 'px'});
$("#viewport-vp").css({'width': vpWidth + 'px'});
$("#viewport-top").css({'height': vpHeight + 'px'});
OME.preview_viewport.refresh(true);
}
});

$("#preview_tab").omeroweb_right_plugin({
plugin_index:{{ forloop.counter }},
load_plugin_content: function(selected, obj_dtype, obj_id) { // Url based on selected object(s)
Expand Down
1 change: 1 addition & 0 deletions components/tools/OmeroWeb/omeroweb/webgateway/static/webgateway/js/ome.nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ $(document).ready(function()
})
.bind("dragstop", function(event, ui) {
$(this).css("left", "0px");
$("#right_panel").trigger('resize');
});

})