version 0.1, document coming

yinyanfr · Apr 2, 2016 · 36a8e6c · 36a8e6c
1 parent 722aaa1
commit 36a8e6c
Show file tree

Hide file tree

Showing 10 changed files with 944 additions and 665 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,5 @@ jquery-*
 *.json
 *.(mp3|ogg)
 *.(jpg|png)
-page.js
+page.js
+*.js___jb_old___
diff --git a/common/control.js b/common/control.js
@@ -2,14 +2,14 @@
  * Created by yan on 16/2/14.
  */
 
-// TODO automatic resource collector
+// TODO for version 0.3 automatic resource collector
 ns.media = {
     images: [],
     audios: []
 };
 
 /**
- * TODO modify the condition to pass a state object to program and declination otherwise
+ * TODO for version 0.3 modify the condition to pass a state object to program and declination otherwise
  * @param state
  * @returns {boolean}
  */
@@ -19,28 +19,14 @@ ns.controls.statePassable = function (state) {
         return state
     }else return false
 };
-/*
-ns.initControls = function (setting) {
-    setting = setting || ns.default.setting;
-    ns.controls.theme = setting.theme;
-    // relation amang scripts paragraphes
-    ns.controls.relation = setting.relation
 
-};*/
 
 ns.initControls = function (setting) {
     setting = setting || ns.default.setting;
     ns.controls.theme = ns.ui.themes[setting.theme];
     // relation amang scripts paragraphes
     ns.controls.relation = {
-        /*
-         script1: [
-         {
-         condition: true,
-         child: "script2"
-         }
-         ]
+        /* TODO for version 0.2
          */
     };
-
 };
diff --git a/common/init.js b/common/init.js
@@ -30,6 +30,6 @@ ns.init = function (data, $frame, setting) {
     ns.stage.$main.appendTo(ns.$frame);
     ns.slides = ns.slide();
     ns.resource = ns.initResource(setting);
-    ns.start();
+    // ns.start();
 
 };
diff --git a/common/resource.js b/common/resource.js
@@ -7,20 +7,21 @@ ns.initResource = function (setting) {
     resource.images = {};
     resource.audios = {};
     resource.get = function (type, name) {
-        // 0.1 not yet preloader
+        //TODO 0.1 not yet preloader
         switch (type){
             case "figure":
                 return $("<img />").attr("src", setting.path["figure"] + name);
             case "cg":
-                return $("<img />").attr("src", setting.path["cg"] + name);
+                return setting.path["cg"] + name;
             case "bg":
-                return $("<img />").attr("src", setting.path["bg"] + name);
+                return setting.path["bg"] + name;
             case "bgm":
                 return $("<audio></audio>").attr("src", setting.path["bgm"] + name);
             default:
                 throw "No specified type " + type
         }
-    }
+    };
+    return resource
 };
 
 ns.resource = {};

diff --git a/common/slide.js b/common/slide.js
@@ -13,6 +13,7 @@ ns.slide = function () {
     var stage = ns.stage;
     var dp = ns.dp;
     var relation = ns.relation;
+    var resource = ns.resource;
     /**
      * update the display of a slide
      */
@@ -97,24 +98,28 @@ ns.slide = function () {
         stage.$main.css("background-image", "url("+url+")")
     };
     slide.bg = function () {
-        //TODO management of repo * 3
-        slide.changeBackgroundImage("tmp/e/"+stack.bg)
+        if(stack.bg === 0 || stack.bg === "0") stage.$main.css("background-image", "none");
+        else slide.changeBackgroundImage(resource.get("bg", stack.bg))
     };
     slide.cg = function () {
-        if(stack.cg === 0 || stack.cg === "0") slide.bg();
-        else slide.changeBackgroundImage(stack.cg)
+        if(stack.cg === 0 || stack.cg === "0"){
+            slide.bg();
+            stage.$figure.show();
+        }
+        else{
+            stage.$figure.hide();
+            slide.changeBackgroundImage(resource.get("cg", stack.cg))
+        }
     };
     slide.figures = [];
     slide.figure = function () {
         slide.figures = [];
         stage.$figure.html("");
         for(var i = 0; i < stack.figure.length - 1; i++){
-            slide.figures.push($("<img />")
-                .attr("src", "tmp/e/" + stack.figure[i]));
+            slide.figures.push(resource.get("figure", stack.figure[i]));
                 //.css("float", "left"))
         }
-        slide.figures.push($("<img />")
-            .attr("src", "tmp/e/" + stack.figure[i]));
+        slide.figures.push(resource.get("figure", stack.figure[i]));
         for(i = 0; i < slide.figures.length; i++){
             slide.figures[i].css(ns.controls.theme.figureImageStyle)
                 .appendTo(stage.$figure)
@@ -140,7 +145,7 @@ ns.slide = function () {
                 .bind("click", slide.move)
         });
         slide.next();
-        console.log(relation);
+        //console.log(stack)
     };
     /**
      * intermediate function for controlling typer
@@ -162,4 +167,4 @@ ns.slide = function () {
     return slide
 };
 
-ns.slides = {};
+ns.slides = {};
diff --git a/lib/typer.js b/lib/typer.js
@@ -13,14 +13,18 @@ ns.typer = (function () {
 
     typer.given = function ($selecter, text, f) {
         $selecter.append(text);
-        f=f||function(){return 0};
+        f = f || function () {
+                return 0
+            };
         f()
     };
 
     typer.typing = function ($selecter, string, speed, f) {
-        string = " "+string;
-        speed = speed||100;
-        f=f||function(){return 0};
+        string = " " + string;
+        speed = speed || 100;
+        f = f || function () {
+                return 0
+            };
         var aux = function ($selecter, list, f) {
             $selecter.append(list.shift()).delay(speed).queue(function () {
                 if (list.length === 0) {
@@ -35,9 +39,11 @@ ns.typer = (function () {
     };
 
     typer.flush = function ($selecter, string, speed, f) {
-        string = " "+string;
-        speed = speed||10;
-        f=f||function(){return 0};
+        string = " " + string;
+        speed = speed || 10;
+        f = f || function () {
+                return 0
+            };
         var aux = function ($selecter, list, f) {
             $selecter.append($("<span></span>").html(list.shift()).fadeIn(speed)).delay(speed).queue(function () {
                 if (list.length === 0) {
@@ -51,21 +57,22 @@ ns.typer = (function () {
         aux($selecter, string.split(''), f)
 
     };
-
-    typer.wait = function ($selecter, time, f) {
-        f=f||function(){return 0};
-        $selecter.append("<span id='typewait' style='display:none'>_</span>");
-        var aux = function(time,f){
-            $("#typewait").show().delay(800).hide(300,function(){
-                if(time === 1){
-                    f()
-                }else{
-                    aux(time-1,f)
-                }
-                //$(this).dequeue()
-            });
-        };
-        aux(time,f)
-    };
+    /*
+     typer.wait = function ($selecter, time, f) {
+     f=f||function(){return 0};
+     $selecter.append("<span id='typewait' style='display:none'>_</span>");
+     var aux = function(time,f){
+     $("#typewait").show().delay(800).hide(300,function(){
+     if(time === 1){
+     f()
+     }else{
+     aux(time-1,f)
+     }
+     //$(this).dequeue()
+     });
+     };
+     aux(time,f)
+     };
+     */
     return typer
 })();