1.rename to Flow 2.remove buster test 3.add nest flow control

yaoazhen · Nov 26, 2013 · 926bb72 · 926bb72
1 parent 6ad676f
commit 926bb72
Show file tree

Hide file tree

Showing 15 changed files with 913 additions and 368 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "bower_components"
+}
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text = auto
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,9 @@
+node_modules
+dist
+.idea
+.tmp
+.DS_Store
+*.log
+
+
+bower_components/
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -0,0 +1,35 @@
+'use strict';
+
+module.exports = function (grunt) {
+  require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
+
+  grunt.initConfig({
+    jshint: {
+
+    },
+    clean: {
+      dist: {
+
+      }
+    },
+    watch: {
+
+    },
+    concat:{
+
+    }
+  });
+
+
+  grunt.registerTask('server', function () {
+
+  });
+
+  grunt.registerTask('build', function () {
+
+  });
+
+  grunt.registerTask('test', function () {
+
+  });
+};
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Jumper
+Flow
 ======
 
-function flow control library
+Flow control library
diff --git a/bower.json b/bower.json
@@ -0,0 +1,8 @@
+{
+  "name": "Flow",
+  "version": "0.5.0",
+  "dependencies": {
+    "jquery": "~1.9.1",
+    "underscore": "*"
+  }
+}
diff --git a/buster.js b/buster.js
diff --git a/example/example.html b/example/example.html
@@ -1,43 +1,47 @@
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="UTF-8" />
-<title>Example</title>
-<script type="text/javascript" src="../underscore.js"></script>
-<script type="text/javascript" src="../jumper.js"></script>
+    <meta charset="UTF-8"/>
+    <title>Example</title>
+    <script type="text/javascript" src="../src/Flow.js"></script>
 </head>
 <body>
-	<h1>Results in the console</h1>
-	<script type="text/javascript">
-		var processExemple = new Jumper(
-				function(a,b,c){
-					// If you want to using the once function, you have to give a name for the function
-					// like once and onceInAll
+<h1>Results in the console</h1>
+<script type="text/javascript">
+    var processExemple = new Flow(
+            function (a, b, c) {
+                // If you want to using the once function, you have to give a name for the function
+                // like once and onceInAll
 
-					this.onceInAll('t11', function(){
-						console.log('ALL 1-1'); // Just run once even you back to this step
-					});
-					console.log(1);
-					this.once('t12', function(){
-						console.log('Step 1-2 param:' +a +b+c); // Run once every time go to this step
-					});
-				}
-				,function(e,f,g){
-					console.log(2);
-					this.once('t22',function(){
-						console.log('Step 2-1 param:'+e+f+g);
-					});
-				}
-				,function(){
-					console.log(3);
-				}
-				,function(){
-					console.log(4);
-				}
-				,function(){
-					console.log(5);
-				}).go(1,2,3).go(4,5,6).go().go().go().back().back().back(4,5,6).action().back(1,2,3).action();
-				// Here you can pass the args with go(),back(),action() for functions
-	</script>
+                this.onceInAll('t11', function () {
+                    console.log('ALL 1-1'); // Just run once even you back to this step
+                });
+                console.log(1);
+                this.once('t12', function () {
+                    console.log('Step 1-2 param:' + a + b + c); // Run once every time go to this step
+                });
+            }
+            , function (e, f, g) {
+                console.log(2);
+                this.once('t22', function () {
+                    console.log('Step 2-1 param:' + e + f + g);
+                });
+            }
+            , new Flow(function () {
+                        console.log("Sub flow 3.1");
+                    }, function () {
+                        console.log("Sub flow 3.2");
+                    }, new Flow()
+            )
+            , function () {
+                console.log(4);
+            }
+            , function () {
+                console.log(5);
+            }).go(1, 2, 3).go(4, 5, 6).go().go().go().go().go()
+            .go().go().go().go().go().go().go()
+            .back().back().back().back(4, 5, 6).action().back(1, 2, 3).action();
+    // Here you can pass the args with go(),back(),action() for functions
+</script>
 </body>
 </html>
diff --git a/example/example_underscore.html b/example/example_underscore.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8"/>
+    <title>Example with underscore</title>
+    <script type="text/javascript" src="../bower_components/underscore/underscore.js"></script>
+    <script type="text/javascript" src="../src/Flow_underscore.js"></script>
+</head>
+<body>
+<h1>Results in the console</h1>
+<script type="text/javascript">
+    var processExemple = new Flow(
+            function (a, b, c) {
+                // If you want to using the once function, you have to give a name for the function
+                // like once and onceInAll
+
+                this.onceInAll('t11', function () {
+                    console.log('ALL 1-1'); // Just run once even you back to this step
+                });
+                console.log(1);
+                this.once('t12', function () {
+                    console.log('Step 1-2 param:' + a + b + c); // Run once every time go to this step
+                });
+            }
+            , function (e, f, g) {
+                console.log(2);
+                this.once('t22', function () {
+                    console.log('Step 2-1 param:' + e + f + g);
+                });
+            }
+            , new Flow(function () {
+                        console.log("Sub flow 3.1");
+                    }, function () {
+                        console.log("Sub flow 3.2");
+                    }, new Flow()
+            )
+            , function () {
+                console.log(4);
+            }
+            , function () {
+                console.log(5);
+            }).go(1, 2, 3).go(4, 5, 6).go().go().go().go().go()
+            .go().go().go().go().go().go().go()
+            .back().back().back().back(4, 5, 6).action().back(1, 2, 3).action();
+    // Here you can pass the args with go(),back(),action() for functions
+</script>
+</body>
+</html>