Merge pull request #129 from readium/feature/issue-115

#115: Reflowable page in FXL document is not laid out properly when in two-up mode
readium · Oct 16, 2014 · 64571c5 · 64571c5
2 parents 473129b + 92e1021
commit 64571c5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/js/models/fixed_page_spread.js b/js/models/fixed_page_spread.js
@@ -82,7 +82,10 @@ ReadiumSDK.Models.Spread = function(spine, isSyntheticSpread) {
             var neighbour = getNeighbourItem(item);
             if(neighbour) {
                 var neighbourPos = getItemPosition(neighbour);
-                if(neighbourPos != position && neighbourPos != ReadiumSDK.Models.Spread.POSITION_CENTER)  {
+                if (neighbourPos != position
+                    && neighbourPos != ReadiumSDK.Models.Spread.POSITION_CENTER
+                    //exclude a neighbour that is a reflowable item from the spread (see RSJ#115)
+                    && !neighbour.isReflowable()) {
                     setItemToPosition(neighbour, neighbourPos);
                 }
             }