@@ -1278,7 +1278,7 @@ window.divaPlugins = [];
1278
1278
// If it has changed, adjust panel size coming out of fullscreen
1279
1279
if ( ! settings . inFullscreen )
1280
1280
{
1281
- adjustBrowserDims ( ) ;
1281
+ updatePanelSize ( ) ;
1282
1282
}
1283
1283
1284
1284
if ( settings . oldZoomLevel >= 0 && ! settings . inGrid )
@@ -1479,11 +1479,11 @@ window.divaPlugins = [];
1479
1479
{
1480
1480
pageIndex = ( typeof ( pageIndex ) === "undefined" ? settings . currentPageIndex : pageIndex ) ;
1481
1481
1482
- if ( anchor == "top" )
1482
+ if ( anchor == "top" )
1483
1483
{
1484
1484
return parseInt ( settings . panelHeight / 2 , 10 ) ;
1485
1485
}
1486
- else if ( anchor == "bottom" )
1486
+ else if ( anchor == "bottom" )
1487
1487
{
1488
1488
return parseInt ( getPageData ( pageIndex , "h" ) - settings . panelHeight / 2 , 10 ) ;
1489
1489
}
@@ -1498,11 +1498,11 @@ window.divaPlugins = [];
1498
1498
{
1499
1499
pageIndex = ( typeof ( pageIndex ) === "undefined" ? settings . currentPageIndex : pageIndex ) ;
1500
1500
1501
- if ( anchor == "left" )
1501
+ if ( anchor == "left" )
1502
1502
{
1503
1503
return parseInt ( settings . panelWidth / 2 , 10 ) ;
1504
1504
}
1505
- else if ( anchor == "right" )
1505
+ else if ( anchor == "right" )
1506
1506
{
1507
1507
return parseInt ( getPageData ( pageIndex , "w" ) - settings . panelWidth / 2 , 10 ) ;
1508
1508
}
@@ -1568,7 +1568,7 @@ window.divaPlugins = [];
1568
1568
} ;
1569
1569
1570
1570
// updates panelHeight/panelWidth on resize
1571
- var adjustBrowserDims = function ( )
1571
+ var updatePanelSize = function ( )
1572
1572
{
1573
1573
var outerElem = document . getElementById ( settings . ID + 'outer' ) ;
1574
1574
settings . panelHeight = outerElem . clientHeight - ( outerElem . scrollWidth > outerElem . clientWidth ? settings . scrollbarWidth : 0 ) ;
@@ -1829,7 +1829,7 @@ window.divaPlugins = [];
1829
1829
// Catch the key presses in document
1830
1830
$ ( document ) . keydown ( function ( event )
1831
1831
{
1832
- if ( ! settings . isActiveDiva )
1832
+ if ( ! settings . isActiveDiva )
1833
1833
return ;
1834
1834
1835
1835
// Space or page down - go to the next page
@@ -1886,7 +1886,7 @@ window.divaPlugins = [];
1886
1886
{
1887
1887
$ ( window ) . resize ( function ( )
1888
1888
{
1889
- adjustBrowserDims ( ) ;
1889
+ updatePanelSize ( ) ;
1890
1890
// Cancel any previously-set resize timeouts
1891
1891
clearTimeout ( settings . resizeTimer ) ;
1892
1892
@@ -1906,7 +1906,7 @@ window.divaPlugins = [];
1906
1906
{
1907
1907
var oldWidth = settings . panelWidth ;
1908
1908
var oldHeight = settings . panelHeight ;
1909
- adjustBrowserDims ( ) ;
1909
+ updatePanelSize ( ) ;
1910
1910
1911
1911
settings . horizontalOffset -= ( settings . panelWidth - oldWidth ) / 2 ;
1912
1912
settings . verticalOffset -= ( settings . panelHeight - oldHeight ) / 2 ;
@@ -1916,7 +1916,7 @@ window.divaPlugins = [];
1916
1916
loadViewer ( ) ;
1917
1917
} ) ;
1918
1918
}
1919
- diva . Events . subscribe ( 'UpdatePanelSize ' , adjustBrowserDims ) ;
1919
+ diva . Events . subscribe ( 'PanelSizeDidChange ' , updatePanelSize ) ;
1920
1920
}
1921
1921
} ;
1922
1922
@@ -2360,7 +2360,7 @@ window.divaPlugins = [];
2360
2360
}
2361
2361
2362
2362
// Adjust the document panel dimensions
2363
- adjustBrowserDims ( ) ;
2363
+ updatePanelSize ( ) ;
2364
2364
2365
2365
// Make sure the value for settings.goDirectlyTo is valid
2366
2366
if ( ! isPageValid ( parseInt ( settings . goDirectlyTo ) , 10 ) )
@@ -2416,7 +2416,7 @@ window.divaPlugins = [];
2416
2416
loadViewer ( ) ;
2417
2417
2418
2418
//prep dimensions one last time now that pages have loaded
2419
- adjustBrowserDims ( ) ;
2419
+ updatePanelSize ( ) ;
2420
2420
2421
2421
// Execute the callback
2422
2422
executeCallback ( settings . onReady , settings ) ;
@@ -2973,23 +2973,23 @@ window.divaPlugins = [];
2973
2973
var outerRight = outerLeft + outerObj . outerWidth ( ) ;
2974
2974
2975
2975
//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 )
2977
2977
return false ;
2978
2978
2979
- if ( pageY < outerTop || pageY > outerBottom )
2979
+ if ( pageY < outerTop || pageY > outerBottom )
2980
2980
return false ;
2981
2981
2982
2982
//navigate through all divs starting with "x-diva-page"
2983
2983
var curPageIdx = $ ( "div[id^=" + settings . ID + "page]" ) . length ;
2984
- while ( curPageIdx -- )
2984
+ while ( curPageIdx -- )
2985
2985
{
2986
2986
var curPage = $ ( $ ( "div[id^=" + settings . ID + "page]" ) [ curPageIdx ] ) ;
2987
2987
var pageIndex = curPage . attr ( 'data-index' ) ;
2988
2988
var curPosition = curPage . position ( ) ;
2989
2989
var curOffset = curPage . offset ( ) ;
2990
2990
var curTop , curLeft ;
2991
2991
2992
- if ( settings . verticallyOriented )
2992
+ if ( settings . verticallyOriented )
2993
2993
{
2994
2994
curTop = curPosition . top - outerObj . scrollTop ( ) + outerTop ;
2995
2995
curLeft = curOffset . left - outerObj . scrollLeft ( ) + outerLeft ;
@@ -3004,11 +3004,11 @@ window.divaPlugins = [];
3004
3004
var curRight = curLeft + curPage . outerWidth ( ) ;
3005
3005
3006
3006
//if this point is outside the horizontal boundaries, continue
3007
- if ( pageX < curLeft || pageX > curRight )
3007
+ if ( pageX < curLeft || pageX > curRight )
3008
3008
continue
3009
3009
3010
3010
//same with vertical boundaries
3011
- if ( pageY < curTop || pageY > curBottom )
3011
+ if ( pageY < curTop || pageY > curBottom )
3012
3012
continue
3013
3013
3014
3014
//if we made it through the above two, we found the page we're looking for
0 commit comments