From 272c2f565c04a9b9495f6085e1e20a0fec7f74b3 Mon Sep 17 00:00:00 2001 From: mcbain Date: Sat, 20 Dec 2014 11:40:11 +0100 Subject: [PATCH 1/5] relative include --- src/layouts/ListLayout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/ListLayout.js b/src/layouts/ListLayout.js index 6250e2b..408f0a7 100644 --- a/src/layouts/ListLayout.js +++ b/src/layouts/ListLayout.js @@ -69,7 +69,7 @@ define(function(require, exports, module) { // import dependencies var Utility = require('famous/utilities/Utility'); - var LayoutUtility = require('famous-flex/LayoutUtility'); + var LayoutUtility = require('../LayoutUtility'); // Define capabilities of this layout function var capabilities = { From 7fa6adc5ca0a0d88af94a7ef17fe087e470116c5 Mon Sep 17 00:00:00 2001 From: mcbain Date: Sat, 20 Dec 2014 11:40:33 +0100 Subject: [PATCH 2/5] relative include --- src/layouts/CollectionLayout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/CollectionLayout.js b/src/layouts/CollectionLayout.js index e4382cf..21a828e 100644 --- a/src/layouts/CollectionLayout.js +++ b/src/layouts/CollectionLayout.js @@ -48,7 +48,7 @@ define(function(require, exports, module) { // import dependencies var Utility = require('famous/utilities/Utility'); - var LayoutUtility = require('famous-flex/LayoutUtility'); + var LayoutUtility = require('../LayoutUtility'); // Define capabilities of this layout function var capabilities = { From 042658578c9971f40999b3dbf7ebfd3a08914c0c Mon Sep 17 00:00:00 2001 From: Jens Zastrow Date: Sat, 20 Dec 2014 14:38:47 +0100 Subject: [PATCH 3/5] use browsify-shims https://github.com/substack/browserify-handbook to export all flex-scrollview classes globally without include of all famous classes. e.g. ijzerenhein.FlexScrollView Famous classes are supposed to be defined globally too e.g. famous.core.Surface etc. --- .gitignore | 1 + global-no-famous.template.js | 9 +++++++++ package.json | 28 ++++++++++++++++++++++------ 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 global-no-famous.template.js diff --git a/.gitignore b/.gitignore index 4ff040b..ceceb26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules bower_components npm-debug.log +global-no-famous.js diff --git a/global-no-famous.template.js b/global-no-famous.template.js new file mode 100644 index 0000000..826b2cd --- /dev/null +++ b/global-no-famous.template.js @@ -0,0 +1,9 @@ +if (typeof ijzerenhein === 'undefined') { + ijzerenhein = {}; +} +_.extend(ijzerenhein, { + FlexScrollView: require('./src/FlexScrollView'), + layouts: { + CoverLayout: require('./src/layouts/CoverLayout') + } +}); diff --git a/package.json b/package.json index 6bc55f1..548c6e5 100644 --- a/package.json +++ b/package.json @@ -7,11 +7,27 @@ "url": "git://github.com/IjzerenHein/famous-flex.git" }, "browserify": { - "transform": [ - "deamdify", - "famousify", - "brfs" - ] + "transform": ["browserify-shim"] + }, + "scripts": { + "global-no-famous": "browserify global-no-famous.template.js -t browserify-shim -o global-no-famous.js --debug --verbose" + }, + "browserify-shim": { + "famous/core/OptionsManager": "global:famous.core.OptionsManager", + "famous/utilities/Utility": "global:famous.utilities.Utility", + "famous/surfaces/ContainerSurface": "global:famous.surfaces.ContainerSurface", + "famous/core/EventHandler": "global:famous.core.EventHandler", + "famous/core/Transform": "global:famous.core.Transform", + "famous/math/Vector": "global:famous.math.Vector", + "famous/core/Group": "global:famous.core.Group", + "famous/physics/PhysicsEngine": "global:famous.physics.PhysicsEngine", + "famous/physics/forces/Drag": "global:famous.physics.forces.Drag", + "famous/physics/forces/Spring": "global:famous.physics.forces.Spring", + "famous/inputs/ScrollSync": "global:famous.inputs.ScrollSync", + "famous/physics/bodies/Particle": "global:famous.physics.bodies.Particle", + "famous/transitions/Transitionable": "global:famous.transitions.Transitionable", + "famous/core/Entity": "global:famous.core.Entity", + "famous/core/ViewSequence": "global:famous.core.ViewSequence" }, "author": { "name": "Hein Rutjes " @@ -45,8 +61,8 @@ "devDependencies": { "brfs": "latest", "browserify": "latest", + "browserify-shim": "latest", "deamdify": "latest", - "famousify": "latest", "grunt": "latest", "grunt-eslint": "latest", "grunt-jscs": "latest", From 887bd4c1b7c9504a4cd2236655d67ed0d5f5858f Mon Sep 17 00:00:00 2001 From: Jens Zastrow Date: Sat, 20 Dec 2014 15:14:02 +0100 Subject: [PATCH 4/5] export more classes --- global-no-famous.template.js | 31 +++++++++++++++++++++++++------ package.json | 5 ++++- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/global-no-famous.template.js b/global-no-famous.template.js index 826b2cd..64cac48 100644 --- a/global-no-famous.template.js +++ b/global-no-famous.template.js @@ -1,9 +1,28 @@ if (typeof ijzerenhein === 'undefined') { ijzerenhein = {}; } -_.extend(ijzerenhein, { - FlexScrollView: require('./src/FlexScrollView'), - layouts: { - CoverLayout: require('./src/layouts/CoverLayout') - } -}); + +ijzerenhein.FlexScrollView = require('./src/FlexScrollView'); +ijzerenhein.FlowLayoutNode = require('./src/FlowLayoutNode'); +ijzerenhein.LayoutContext = require('./src/LayoutContext'); +ijzerenhein.LayoutController = require('./src/LayoutController'); +ijzerenhein.LayoutNode = require('./src/LayoutNode'); +ijzerenhein.LayoutNodeManager = require('./src/LayoutNodeManager'); +ijzerenhein.LayoutUtility = require('./src/LayoutUtility'); +ijzerenhein.ScrollController = require('./src/ScrollController'); +ijzerenhein.ScrollView = require('./src/ScrollView'); + +ijzerenhein.layout = ijzerenhein.layout || {}; + +ijzerenhein.layout.CollectionLayout = require('./src/layouts/CollectionLayout'); +ijzerenhein.layout.CoverLayout = require('./src/layouts/CoverLayout'); +ijzerenhein.layout.CubeLayout = require('./src/layouts/CubeLayout'); +ijzerenhein.layout.GridLayout = require('./src/layouts/GridLayout'); +ijzerenhein.layout.HeaderFooterLayout = require('./src/layouts/HeaderFooterLayout'); +ijzerenhein.layout.ListLayout = require('./src/layouts/ListLayout'); +ijzerenhein.layout.NavBarLayout = require('./src/layouts/NavBarLayout'); +ijzerenhein.layout.TableLayout = require('./src/layouts/TableLayout'); + +ijzerenhein.helpers = ijzerenhein.helpers || {}; + +ijzerenhein.helpers.LayoutDockHelper = require('./src/helpers/LayoutDockHelper'); diff --git a/package.json b/package.json index 548c6e5..fdc6b8c 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,10 @@ "url": "git://github.com/IjzerenHein/famous-flex.git" }, "browserify": { - "transform": ["browserify-shim"] + "transform": [ + "browserify-shim", + "deamdify" + ] }, "scripts": { "global-no-famous": "browserify global-no-famous.template.js -t browserify-shim -o global-no-famous.js --debug --verbose" From 3f122ac4444965aac39f8efb46370d2093cdf95c Mon Sep 17 00:00:00 2001 From: Jens Zastrow Date: Sat, 20 Dec 2014 15:18:51 +0100 Subject: [PATCH 5/5] dont export deprecated ScrollView and TableLayout --- global-no-famous.template.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global-no-famous.template.js b/global-no-famous.template.js index 64cac48..a337e14 100644 --- a/global-no-famous.template.js +++ b/global-no-famous.template.js @@ -10,7 +10,7 @@ ijzerenhein.LayoutNode = require('./src/LayoutNode'); ijzerenhein.LayoutNodeManager = require('./src/LayoutNodeManager'); ijzerenhein.LayoutUtility = require('./src/LayoutUtility'); ijzerenhein.ScrollController = require('./src/ScrollController'); -ijzerenhein.ScrollView = require('./src/ScrollView'); +//ijzerenhein.ScrollView = require('./src/ScrollView'); ijzerenhein.layout = ijzerenhein.layout || {}; @@ -21,7 +21,7 @@ ijzerenhein.layout.GridLayout = require('./src/layouts/GridLayout'); ijzerenhein.layout.HeaderFooterLayout = require('./src/layouts/HeaderFooterLayout'); ijzerenhein.layout.ListLayout = require('./src/layouts/ListLayout'); ijzerenhein.layout.NavBarLayout = require('./src/layouts/NavBarLayout'); -ijzerenhein.layout.TableLayout = require('./src/layouts/TableLayout'); +//ijzerenhein.layout.TableLayout = require('./src/layouts/TableLayout'); ijzerenhein.helpers = ijzerenhein.helpers || {};