Skip to content

Commit f21c0c7

Browse files
committed
Fixed: cleaning up PanelSize changes
-Updated spacing in if/else/while statements -Changed adjustBrowserDims private function to updatePanelSize to better reflect its purpose -Renamed "UpdatePanelSize" event to "PanelSizeDidChange" Refs #235
1 parent 1ea372f commit f21c0c7

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

source/js/diva.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ window.divaPlugins = [];
12781278
// If it has changed, adjust panel size coming out of fullscreen
12791279
if (!settings.inFullscreen)
12801280
{
1281-
adjustBrowserDims();
1281+
updatePanelSize();
12821282
}
12831283

12841284
if (settings.oldZoomLevel >= 0 && !settings.inGrid)
@@ -1479,11 +1479,11 @@ window.divaPlugins = [];
14791479
{
14801480
pageIndex = (typeof(pageIndex) === "undefined" ? settings.currentPageIndex : pageIndex);
14811481

1482-
if(anchor == "top")
1482+
if (anchor == "top")
14831483
{
14841484
return parseInt(settings.panelHeight / 2, 10);
14851485
}
1486-
else if(anchor == "bottom")
1486+
else if (anchor == "bottom")
14871487
{
14881488
return parseInt(getPageData(pageIndex, "h") - settings.panelHeight / 2, 10);
14891489
}
@@ -1498,11 +1498,11 @@ window.divaPlugins = [];
14981498
{
14991499
pageIndex = (typeof(pageIndex) === "undefined" ? settings.currentPageIndex : pageIndex);
15001500

1501-
if(anchor == "left")
1501+
if (anchor == "left")
15021502
{
15031503
return parseInt(settings.panelWidth / 2, 10);
15041504
}
1505-
else if(anchor == "right")
1505+
else if (anchor == "right")
15061506
{
15071507
return parseInt(getPageData(pageIndex, "w") - settings.panelWidth / 2, 10);
15081508
}
@@ -1568,7 +1568,7 @@ window.divaPlugins = [];
15681568
};
15691569

15701570
// updates panelHeight/panelWidth on resize
1571-
var adjustBrowserDims = function ()
1571+
var updatePanelSize = function ()
15721572
{
15731573
var outerElem = document.getElementById(settings.ID + 'outer');
15741574
settings.panelHeight = outerElem.clientHeight - (outerElem.scrollWidth > outerElem.clientWidth ? settings.scrollbarWidth : 0);
@@ -1829,7 +1829,7 @@ window.divaPlugins = [];
18291829
// Catch the key presses in document
18301830
$(document).keydown(function (event)
18311831
{
1832-
if(!settings.isActiveDiva)
1832+
if (!settings.isActiveDiva)
18331833
return;
18341834

18351835
// Space or page down - go to the next page
@@ -1886,7 +1886,7 @@ window.divaPlugins = [];
18861886
{
18871887
$(window).resize(function ()
18881888
{
1889-
adjustBrowserDims();
1889+
updatePanelSize();
18901890
// Cancel any previously-set resize timeouts
18911891
clearTimeout(settings.resizeTimer);
18921892

@@ -1906,7 +1906,7 @@ window.divaPlugins = [];
19061906
{
19071907
var oldWidth = settings.panelWidth;
19081908
var oldHeight = settings.panelHeight;
1909-
adjustBrowserDims();
1909+
updatePanelSize();
19101910

19111911
settings.horizontalOffset -= (settings.panelWidth - oldWidth) / 2;
19121912
settings.verticalOffset -= (settings.panelHeight - oldHeight) / 2;
@@ -1916,7 +1916,7 @@ window.divaPlugins = [];
19161916
loadViewer();
19171917
});
19181918
}
1919-
diva.Events.subscribe('UpdatePanelSize', adjustBrowserDims);
1919+
diva.Events.subscribe('PanelSizeDidChange', updatePanelSize);
19201920
}
19211921
};
19221922

@@ -2360,7 +2360,7 @@ window.divaPlugins = [];
23602360
}
23612361

23622362
// Adjust the document panel dimensions
2363-
adjustBrowserDims();
2363+
updatePanelSize();
23642364

23652365
// Make sure the value for settings.goDirectlyTo is valid
23662366
if (!isPageValid(parseInt(settings.goDirectlyTo), 10))
@@ -2416,7 +2416,7 @@ window.divaPlugins = [];
24162416
loadViewer();
24172417

24182418
//prep dimensions one last time now that pages have loaded
2419-
adjustBrowserDims();
2419+
updatePanelSize();
24202420

24212421
// Execute the callback
24222422
executeCallback(settings.onReady, settings);
@@ -2973,23 +2973,23 @@ window.divaPlugins = [];
29732973
var outerRight = outerLeft + outerObj.outerWidth();
29742974

29752975
//because pages extend outside the diva-outer class, we want to exclude those values as the pageX/pageY values aren't actually on them
2976-
if(pageX < outerLeft || pageX > outerRight)
2976+
if (pageX < outerLeft || pageX > outerRight)
29772977
return false;
29782978

2979-
if(pageY < outerTop || pageY > outerBottom)
2979+
if (pageY < outerTop || pageY > outerBottom)
29802980
return false;
29812981

29822982
//navigate through all divs starting with "x-diva-page"
29832983
var curPageIdx = $("div[id^=" + settings.ID + "page]").length;
2984-
while(curPageIdx--)
2984+
while (curPageIdx--)
29852985
{
29862986
var curPage = $($("div[id^=" + settings.ID + "page]")[curPageIdx]);
29872987
var pageIndex = curPage.attr('data-index');
29882988
var curPosition = curPage.position();
29892989
var curOffset = curPage.offset();
29902990
var curTop, curLeft;
29912991

2992-
if(settings.verticallyOriented)
2992+
if (settings.verticallyOriented)
29932993
{
29942994
curTop = curPosition.top - outerObj.scrollTop() + outerTop;
29952995
curLeft = curOffset.left - outerObj.scrollLeft() + outerLeft;
@@ -3004,11 +3004,11 @@ window.divaPlugins = [];
30043004
var curRight = curLeft + curPage.outerWidth();
30053005

30063006
//if this point is outside the horizontal boundaries, continue
3007-
if(pageX < curLeft || pageX > curRight)
3007+
if (pageX < curLeft || pageX > curRight)
30083008
continue
30093009

30103010
//same with vertical boundaries
3011-
if(pageY < curTop || pageY > curBottom)
3011+
if (pageY < curTop || pageY > curBottom)
30123012
continue
30133013

30143014
//if we made it through the above two, we found the page we're looking for

0 commit comments

Comments
 (0)