Merge pull request #308 from ArtBookMagazine/feature/resize-event-tri…

…ggers-pagination Replace font loader with a resize event in reflow and scroll view
readium · Oct 4, 2016 · 9f9c6ec · 9f9c6ec
2 parents 267605a + 49039dc
commit 9f9c6ec
Show file tree

Hide file tree

Showing 22 changed files with 49,506 additions and 53,482 deletions.
diff --git a/build-config/RequireJS_config_common.js b/build-config/RequireJS_config_common.js
@@ -50,6 +50,9 @@ require.config({
         jquerySizes:
             process._RJS_rootDir(1) + '/node_modules/jquery-sizes/lib/jquery.sizes',
 
+        ResizeSensor:
+            process._RJS_rootDir(1) + '/node_modules/css-element-queries/src/ResizeSensor',
+
         domReady:
             process._RJS_rootDir(1) + '/node_modules/domReady/domReady',
 
@@ -60,9 +63,6 @@ require.config({
         "es6-collections":
             process._RJS_rootDir(1) + '/node_modules/es6-collections/index',
 
-        'FontLoader':
-            process._RJS_rootDir(1) + '/node_modules/FontLoader/FontLoader',
-
         'cssom':
             process._RJS_rootDir(1) + '/node_modules/cssom/build/CSSOM',
 

diff --git a/build-config/RequireJS_config_multiple-bundles_external-libs.js b/build-config/RequireJS_config_multiple-bundles_external-libs.js
@@ -26,7 +26,7 @@ require.config({
             include: ['jquery', 'underscore',
             'URIjs', 'punycode', 'SecondLevelDomains', 'IPv6',
             'jquerySizes', 'domReady', 'eventEmitter', 'console_shim',
-            'rangy', 'rangy-core', 'rangy-textrange', 'rangy-highlighter', 'rangy-cssclassapplier', 'rangy-position', 'cssom', 'FontLoader'],
+            'rangy', 'rangy-core', 'rangy-textrange', 'rangy-highlighter', 'rangy-cssclassapplier', 'rangy-position', 'cssom'],
         }
     ]
 });
diff --git a/build-output/_multiple-bundles/readium-cfi-js.js.map b/build-output/_multiple-bundles/readium-cfi-js.js.map