truck/Sahli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mt #1

Merged
truck merged 17 commits from mt into master 2020-04-09 13:54:45 +03:00
Conversation 0 Commits 17 Files changed 6 +7 -5
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b9363d5ec9 - Show all commits

5
sahli.coffee
View file

@ -85,7 +85,7 @@ class @Sahli
pdiv = $('<div>') pdiv = $('<div>')
pdiv.addClass 'scrolly' pdiv.addClass 'scrolly'
pdiv.addClass 'image' pdiv.addClass 'image'
pdiv.width picdata.width pdiv.width window.innerWidth
pdiv.css 'display', 'inline-block' pdiv.css 'display', 'inline-block'
pimg = $('<img src="' + fname + '" />') pimg = $('<img src="' + fname + '" />')
pimg.addClass 'fullwidth' pimg.addClass 'fullwidth'
@ -95,6 +95,7 @@ class @Sahli
$('body').scrollTop 0 $('body').scrollTop 0
@origwidth = picdata.width @origwidth = picdata.width
@origheight = picdata.height @origheight = picdata.height
@bestfit()
@bestfit = => @bestfit = =>
viewbox = $('div#sahliviewer') viewbox = $('div#sahliviewer')
@ -102,7 +103,7 @@ class @Sahli
if $('div.scrolly').hasClass('bestfitMode') if $('div.scrolly').hasClass('bestfitMode')
$('div.scrolly').removeClass 'bestfitMode' $('div.scrolly').removeClass 'bestfitMode'
$('div.scrolly').addClass 'fullwidthMode' $('div.scrolly').addClass 'fullwidthMode'
$('div.scrolly').width @origwidth $('div.scrolly').width window.innerWidth
$('div.scrolly').height("") $('div.scrolly').height("")
$('img.bestfit').addClass 'fullwidth' $('img.bestfit').addClass 'fullwidth'
$('img.bestfit').removeClass 'bestfit' $('img.bestfit').removeClass 'bestfit'

7
sahli.js
View file

@ -95,7 +95,7 @@ l__________/__________|___|______l__________j_____j
pdiv = $('<div>'); pdiv = $('<div>');
pdiv.addClass('scrolly'); pdiv.addClass('scrolly');
pdiv.addClass('image'); pdiv.addClass('image');
pdiv.width(picdata.width); pdiv.width(window.innerWidth);
pdiv.css('display', 'inline-block'); pdiv.css('display', 'inline-block');
pimg = $('<img src="' + fname + '" />'); pimg = $('<img src="' + fname + '" />');
pimg.addClass('fullwidth'); pimg.addClass('fullwidth');
@ -104,7 +104,8 @@ l__________/__________|___|______l__________j_____j
$('h6').hide(); $('h6').hide();
$('body').scrollTop(0); $('body').scrollTop(0);
this.origwidth = picdata.width; this.origwidth = picdata.width;
return this.origheight = picdata.height; this.origheight = picdata.height;
return this.bestfit();
}; };
Sahli.bestfit = function() { Sahli.bestfit = function() {
@ -114,7 +115,7 @@ l__________/__________|___|______l__________j_____j
if ($('div.scrolly').hasClass('bestfitMode')) { if ($('div.scrolly').hasClass('bestfitMode')) {
$('div.scrolly').removeClass('bestfitMode'); $('div.scrolly').removeClass('bestfitMode');
$('div.scrolly').addClass('fullwidthMode'); $('div.scrolly').addClass('fullwidthMode');
$('div.scrolly').width(Sahli.origwidth); $('div.scrolly').width(window.innerWidth);
$('div.scrolly').height(""); $('div.scrolly').height("");
$('img.bestfit').addClass('fullwidth'); $('img.bestfit').addClass('fullwidth');
return $('img.bestfit').removeClass('bestfit'); return $('img.bestfit').removeClass('bestfit');