Skip to content

Commit

Permalink
Merge pull request #14 from seun40/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@ogewan
ogewan committed Jul 9, 2015
2 parents 1d33ef0 + b0fae47 commit 53ebcf6
Show file tree
Hide file tree
Showing 15 changed files with 807 additions and 345 deletions.
13 changes: 10 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ comix-ngn is
**venue** - This class marks an element as a place for a stage to be imported. These are preferably divs. If the element does not have an id, it is given one automatically.

## Changelog
### comix-ngn version 1.8.5 (beta)
### comix-ngn version 1.9.2 (beta)
**0.5.0**: Initial Setup, Version tracking

**0.7.58**: Added Dependencies (JS): (jquery.min, angular-touch.min, angular.min[Update],bootstrap.min), Carousel for slides, real-time reactivity
Expand Down Expand Up @@ -127,7 +127,12 @@ attribute to preload images but not implemented yet

**1.9.0**: Main file size reduced from 37.051 kB -> 25.56 kB, swipe replaced with direction, stage has been refactored into a constructor, script spec upgraded to v2, load speed appears slower but is still under 200 ms, new plug in added: swip.cng.js, code clean up and organization, direction handles preloading, but router needs to be re-enabled, stageinjection now simply wraps the constructor, need to add app page functionality however.

### comix-ngn Writer version 1.0.0 (beta)
**1.9.1** App pages added

**1.9.2** Major bugfixes, including null and undefined property checking
* addendum: bugfixes on direction js, properties are now more clear

### comix-ngn Writer version 1.1.0 (beta)
**0.5.0**: "Initial Setup, Versioning

**0.8.0**: Huge implementations, Object config by dynamic form injection for Page and Chapter, Setting config compartmentalized, design config added
Expand All @@ -136,7 +141,9 @@ attribute to preload images but not implemented yet

**0.9.6**: pyoofreader gets its own version, continue config fully implemented, cosmetic changes, now able to download a stage and a template index.html

**1.0.0**: Ready for beta,
**1.0.0**: Ready for beta

**1.1.0**: Setup for refactoring, all JS re-specified and deferred, js enclosed in closure

### comix-ngn Pyoofreader Version 0.1.0 (beta)
**0.1.0**: Implemented version, counts page dif and warns of Mismatch
13 changes: 13 additions & 0 deletions apptest.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html><title>App Test</title>
<!--<script src="plugins/bellerophon.cng.min.js" dir template></script><script src="comixngn.js" plugin></script><base href="/comic-ng/">-->
<script>dfr=function(){

};
!function(){return defer?void(window.addEventListener?window.addEventListener("load",dfr,!1):window.attachEvent?window.attachEvent("onload",dfr):window.onload=dfr):dfr()}();</script>

<div>
<div style="visibility: visible;position: absolute;left: 0px;top: 0px;z-index:1;">app 1</div>
<div style="display: block;position: absolute;left: 0px;top: 0px;"><img src="assets/girl_sleeping_noline_(1).jpg"></div>
<div style="display: none;position: absolute;left: 0px;top: 0px;"><img src="assets/hyphen.jpg"></div>
<div style="display: none;position: absolute;left: 0px;top: 0px;"><img src="assets/canyon_small.jpg"></div>
</div>
81 changes: 38 additions & 43 deletions comixngn.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions comixngn.js.map
View file

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions comixngn.min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html><title>comix-ngn</title>
<!--<script src="plugins/bellerophon.cng.min.js" dir template></script><script src="comixngn.js" plugin></script><base href="/comic-ng/">-->
<script>var defer=!0,mainsrc="comixngn.js",loadcng=[],plugin="",dir="",tir="",$GPC=$GPC+1||1,cG={agent:function(b,a){return a=new XMLHttpRequest,a.open("GET",b),b=[],a.onreadystatechange=a.then=function(c,e,d){if(c&&c.call&&(b=[,c,e]),4==a.readyState&&(d=b[0|a.status/200]))try{d(JSON.parse(a.responseText),a)}catch(f){d(a.responseText,a)}},a.send(),a},REPO:{scReq:{}}},dfr=function(){var b=document.createElement("script");cG.REPO.scReq.getScript=cG.agent("./"+dir+"script.json");cG.REPO.scReq.getDecor=cG.agent("./"+
<script>var defer=!0,mainsrc="comixngn.min.js",loadcng=[],plugin="",dir="",tir="",$GPC=$GPC+1||1,cG={agent:function(b,a){return a=new XMLHttpRequest,a.open("GET",b),b=[],a.onreadystatechange=a.then=function(c,e,d){if(c&&c.call&&(b=[,c,e]),4==a.readyState&&(d=b[0|a.status/200]))try{d(JSON.parse(a.responseText),a)}catch(f){d(a.responseText,a)}},a.send(),a},REPO:{scReq:{}}},dfr=function(){var b=document.createElement("script");cG.REPO.scReq.getScript=cG.agent("./"+dir+"script.json");cG.REPO.scReq.getDecor=cG.agent("./"+
tir+"decor.html");cG.REPO.scReq.getScript.then(function(a){void 0===cG.REPO.script?cG.REPO.script={def:a}:cG.REPO.script.def=a;cG.script=cG.REPO.script.def},function(a,b){console.error(a,b.status);void 0===cG.REPO.script?cG.REPO.script={def:0}:cG.REPO.script.def=a;cG.script=cG.REPO.script.def});cG.REPO.scReq.getDecor.then(function(a){void 0===cG.REPO.decor?cG.REPO.decor={def:a}:cG.REPO.decor.def=a;cG.decor=cG.REPO.decor.def},function(a,b){console.error(a,b.status);void 0===cG.REPO.decor?cG.REPO.decor=
{def:0}:cG.REPO.decor.def=0;cG.decor=cG.REPO.decor.def});b.src=mainsrc;document.body.appendChild(b)};!function(){return defer?void(window.addEventListener?window.addEventListener("load",dfr,!1):window.attachEvent?window.attachEvent("onload",dfr):window.onload=dfr):dfr()}();</script>
{def:0}:cG.REPO.decor.def=0;cG.decor=cG.REPO.decor.def});b.src=mainsrc;document.body.appendChild(b);for(var a=0;a<loadcng.length;a++)b=document.createElement("script"),b.src=loadcng[a],document.body.appendChicompileld(b)};!function(){return defer?void(window.addEventListener?window.addEventListener("load",dfr,!1):window.attachEvent?window.attachEvent("onload",dfr):window.onload=dfr):dfr()}();</script>

<!--
if script.json is in a directory other than root, you must specify that directory's path in the optional dir attribute of the script tag, preferably the first. Using different dir values will result in unpredictable behavior.
Expand Down
6 changes: 5 additions & 1 deletion plugins/bellerophon.cng.embed.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@
def: 0
} : cG.REPO.decor.def = 0, cG.decor = cG.REPO.decor.def
});
c.src = mainsrc, document.body.appendChild(c)
c.src = mainsrc, document.body.appendChild(c);
for(var a=0;a<loadcng.length;a++){
c = document.createElement("script");
c.src = loadcng[a], document.body.appendChild(c);
}
};
! function() {
return defer ? void(window.addEventListener ? window.addEventListener("load", dfr, !1) : window.attachEvent ? window.attachEvent("onload", dfr) : window.onload = dfr) : dfr()
Expand Down
2 changes: 1 addition & 1 deletion plugins/bellerophon.cng.min.embed.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<script>var defer=!0,mainsrc="comixngn.min.js",loadcng=[],plugin="",dir="",tir="",$GPC=$GPC+1||1,cG={agent:function(b,a){return a=new XMLHttpRequest,a.open("GET",b),b=[],a.onreadystatechange=a.then=function(c,e,d){if(c&&c.call&&(b=[,c,e]),4==a.readyState&&(d=b[0|a.status/200]))try{d(JSON.parse(a.responseText),a)}catch(f){d(a.responseText,a)}},a.send(),a},REPO:{scReq:{}}},dfr=function(){var b=document.createElement("script");cG.REPO.scReq.getScript=cG.agent("./"+dir+"script.json");cG.REPO.scReq.getDecor=cG.agent("./"+
tir+"decor.html");cG.REPO.scReq.getScript.then(function(a){void 0===cG.REPO.script?cG.REPO.script={def:a}:cG.REPO.script.def=a;cG.script=cG.REPO.script.def},function(a,b){console.error(a,b.status);void 0===cG.REPO.script?cG.REPO.script={def:0}:cG.REPO.script.def=a;cG.script=cG.REPO.script.def});cG.REPO.scReq.getDecor.then(function(a){void 0===cG.REPO.decor?cG.REPO.decor={def:a}:cG.REPO.decor.def=a;cG.decor=cG.REPO.decor.def},function(a,b){console.error(a,b.status);void 0===cG.REPO.decor?cG.REPO.decor=
{def:0}:cG.REPO.decor.def=0;cG.decor=cG.REPO.decor.def});b.src=mainsrc;document.body.appendChild(b)};!function(){return defer?void(window.addEventListener?window.addEventListener("load",dfr,!1):window.attachEvent?window.attachEvent("onload",dfr):window.onload=dfr):dfr()}();</script>
{def:0}:cG.REPO.decor.def=0;cG.decor=cG.REPO.decor.def});b.src=mainsrc;document.body.appendChild(b);for(var a=0;a<loadcng.length;a++)b=document.createElement("script"),b.src=loadcng[a],document.body.appendChild(b)};!function(){return defer?void(window.addEventListener?window.addEventListener("load",dfr,!1):window.attachEvent?window.attachEvent("onload",dfr):window.onload=dfr):dfr()}();</script>
2 changes: 1 addition & 1 deletion script.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"parent":null,"offset":0,"pyr":{"appendmismatch":false,"appendorder":0,"appendorderdir":false},"loading":{"height":250,"lines":16,"rate":33.333333333333336,"width":250,"xpos":0.5,"ypos":0.5,"back":"#FFF","color":"#373737"},"config":{"dir":"assets/","pagestartnum":false,"chapterstartnum":false,"imgprebuffer":5,"imgpostbuffer":5,"startpage":0,"back":"#FFF"},"pages":[{"alt":"","hover":"","title":"","url":["barrel_cropped_(1).jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["tree_cropped_(1).jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["island_color.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["landscape_cropped_(1).jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["blownapart_color.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["irony_color.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["girl_sleeping_noline_(1).jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["red_spiders_small.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["firefly.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["pi.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["barrel_mommies.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["poisson.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["canyon_small.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["copyright.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["just_alerting_you.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["monty_python.jpg"],"release":0,"note":"","anim8":false,"perm":false,"anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["what_if.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["snapple.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["george_clinton.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["ferret.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["kepler.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["barrel_whirlpool.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["t-shirts.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["godel_escher_kurthalsey.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["barrel_part_4.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["fourier.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["meat_cereals.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["elefino.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["hitler.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["donner.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["barrel_part_5.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["pillar.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["self-reference.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["flowers.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["sheep.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["scientists.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["hyphen.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["apple_jacks.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["bowl.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["light.jpg"],"release":0,"note":"","anim8":false,"perm":false}],"chapters":[]}
{"parent":null,"offset":0,"pyr":{"appendmismatch":false,"appendorder":0,"appendorderdir":false},"loading":{"diameter": 250,"lines":16,"rate":33.333333333333336,"xpos":0.5,"ypos":0.5,"back":"#FFF","color":"#373737"},"config":{"dir":"assets/","pagestartnum":false,"chapterstartnum":false,"imgprebuffer":5,"imgpostbuffer":5,"startpage":0,"back":"#FFF"},"pages":[{"alt":"","hover":"","title":"","url":["barrel_cropped_(1).jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["tree_cropped_(1).jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["island_color.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["landscape_cropped_(1).jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["blownapart_color.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["irony_color.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["girl_sleeping_noline_(1).jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["red_spiders_small.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["firefly.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["pi.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["barrel_mommies.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["poisson.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["canyon_small.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["copyright.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["just_alerting_you.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["monty_python.jpg"],"release":0,"note":"","anim8":false,"perm":false,"anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["what_if.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["snapple.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["george_clinton.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["ferret.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["kepler.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["barrel_whirlpool.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["t-shirts.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["godel_escher_kurthalsey.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["barrel_part_4.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["fourier.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["meat_cereals.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["elefino.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["hitler.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["donner.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["barrel_part_5.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["pillar.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["self-reference.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["flowers.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["sheep.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["scientists.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["hyphen.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["apple_jacks.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["bowl.jpg"],"release":0,"note":"","anim8":false,"perm":false},{"alt":"","hover":"","title":"","url":["light.jpg"],"release":0,"note":"","anim8":false,"perm":false}],"chapters":[]}
3 changes: 1 addition & 2 deletions testing/spec_COMIXNGN.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
"back":"#FFF",
},
"loading": {
"height": 250,
"diameter": 250,
"lines": 16,
"rate": 33.333333333333336,
"width": 250,
"xpos": 0.5,
"ypos": 0.5,
"back":"#FFF",
Expand Down
3 changes: 1 addition & 2 deletions testing/specification_v2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"loading": {//loading spinner configuration
"lines":16,//lines in spinner
"rate":1000 / 30,//spin rate
"width":250,//width of spinner
"height":250,//height of spinner
"diameter": 250,//spinner diameter
"xpos":1/2,//x position of spinner relative to canvas size
"ypos":1/2, //y position of spinner relative to canvas size
"back":"#FFF",//background color of spinner
Expand Down
Loading

0 comments on commit 53ebcf6

Please sign in to comment.