Skip to content
This repository has been archived by the owner on Dec 2, 2021. It is now read-only.

Commit

Permalink
Merge pull request #29 from mj-networks/master
Browse files Browse the repository at this point in the history
Use relative include
  • Loading branch information
IjzerenHein committed Dec 21, 2014
2 parents 34d34b4 + 3f122ac commit 33016d4
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
bower_components
npm-debug.log
global-no-famous.js
28 changes: 28 additions & 0 deletions global-no-famous.template.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
if (typeof ijzerenhein === 'undefined') {
ijzerenhein = {};
}

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');
27 changes: 23 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,30 @@
},
"browserify": {
"transform": [
"deamdify",
"famousify",
"brfs"
"browserify-shim",
"deamdify"
]
},
"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 <hrutjes@gmail.com>"
},
Expand Down Expand Up @@ -45,8 +64,8 @@
"devDependencies": {
"brfs": "latest",
"browserify": "latest",
"browserify-shim": "latest",
"deamdify": "latest",
"famousify": "latest",
"grunt": "latest",
"grunt-eslint": "latest",
"grunt-jscs": "latest",
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/CollectionLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/ListLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit 33016d4

Please sign in to comment.