Skip to content

Commit

Permalink
Merge pull request #25 from ogewan/nightly
Browse files Browse the repository at this point in the history
Updating to 1.1.1
  • Loading branch information
ogewan committed Aug 17, 2015
2 parents d3685f9 + 0dab13c commit 10b119e
Show file tree
Hide file tree
Showing 8 changed files with 235 additions and 80 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
_site/
.DS_Store
*.jar
*.bat
*.bat
swatches.html
26 changes: 23 additions & 3 deletions comixngn.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ cG.controllers = cG.controllers||{};//stores all nav bars that control stages he
}
}
if(!pass) return -1;//return if not found
cG.comicID = (selfScript.getAttribute("comicID") !== void 0&&selfScript.getAttribute("disable") !== null)?selfScript.getAttribute("comicID"):cG.comicID;
//check for comicID, no getAttribute if we have cG.comicID
cG.comicID = cG.comicID||selfScript.getAttribute("comicID");
//change default plugin
if(selfScript.getAttribute("plugin") !== void 0&&selfScript.getAttribute("plugin")!==null){
var plugin = selfScript.getAttribute("plugin").replace(/\s+/g, '').split(',');
cG.root = plugin;
Expand Down Expand Up @@ -351,7 +353,25 @@ cG.HELPERS = {};
}();
/*STAGE creation-REDACTED*/
cG.HELPERS.jstagecreate = cG.N;
cG.queue.stageChange={controller:function(target){
cG.queue.stageChange=cG.queue.stageChange||{};
cG.queue.stageChange.hotcontent=function(){
var hotstuff = document.getElementsByClassName("cg-hot");
var hotqueue = [];//window.hotqueue||[];
for (var i = 0; i < hotstuff.length; i++) {
hotqueue.push({place:hotstuff[i].parentNode,time:hotstuff[i]});
}
while (hotstuff.length) {
hotstuff[0].parentNode.removeChild(hotstuff[0]);
}
for (var j = 0; j < hotqueue.length; j++) {
console.log("queued stuff",cG.info.vrb,hotqueue[j])
hotqueue[j].place.appendChild(hotqueue[j].time);/*
if(cG.info.vrb!=500){
hotqueue[j].place.appendChild(hotqueue[j].time);
} else window.hotqueue = hotqueue;*/
}
}
cG.queue.stageChange.controller=function(target){
//console.log(target.data().desig);
var b,
c,
Expand Down Expand Up @@ -393,7 +413,7 @@ cG.queue.stageChange={controller:function(target){
}
}
}
}};
};
cG.controlInjection = function(SPECIFIC){
var stages = [],
ctrls = (cG.ctrls)?cG.ctrls:'<ul><li style="display: inline;"><button class="frst" >|&lt;</button></li><li style="display: inline;"><button class="prev" rel="prev" accesskey="p">&lt; Prev</button></li><li style="display: inline;"><button class="rand" >Random</button></li><li style="display: inline;"><button class="next" rel="next" accesskey="n">Next &gt;</button></li><li style="display: inline;"><button class="last" >&gt;|</button></li></ul>',
Expand Down
6 changes: 3 additions & 3 deletions comixngn.js.map

Large diffs are not rendered by default.

127 changes: 64 additions & 63 deletions comixngn.min.js

Large diffs are not rendered by default.

29 changes: 19 additions & 10 deletions plugins/diskus.cng.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ Order: after comixngn.js
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
//cG.disqus.disqus_identifier = '';
//cG.disqus.disqus_title = '';
//cG.disqus.disqus_url = '';
//cG.discqus.disqus_url = '';
cG.queue=cG.queue||{};
cG.queue.stageChange=cG.queue.stageChange||[];
cG.queue.stageChange.push(function(a,c){
cG.queue.stageChange=cG.queue.stageChange||{};
cG.queue.stageChange.diskus = function(a,c){
//console.log(c,a.data(),cG.disqus,window.DISQUS);
if(c){

}
Expand All @@ -38,14 +39,22 @@ Order: after comixngn.js
cG.disqus.identifier = b.disqus_identifier;
cG.disqus.url = b.disqus_url;
}
DISQUS.reset({
reload: true,
config: function(){
this.page.identifier = cG.disqus.identifier;
this.page.url = cG.disqus.url;
var settheRESET = function(){
//console.log(window.DISQUS,void 0,"setTHERESET");
if(window.DISQUS===void 0||window.DISQUS===null) setTimeout(settheRESET, 400);
else{
window.DISQUS.reset({
reload: true,
config: function(){
this.page.identifier = cG.disqus.identifier;
this.page.url = cG.disqus.url;
}
});
}
});
});
}
settheRESET();
};
//console.log(cG.queue.stageChange.diskus);
/*cG.queue=cG.queue||[];
cG.queue.stageInjection=cG.queue.stageInjection||[];
cG.queue.stageInjection.push("disqus");*/
Expand Down
File renamed without changes.
124 changes: 124 additions & 0 deletions testing/adsense.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>JUST ADS</title>
<script src="../comixngn.js" comicID="adsense" disable="rollbar" dir="../" tir="../" air="../assets/"></script>
<script type="text/javascript">
/* <![CDATA[ */
(function() {
var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
s.type = 'text/javascript';
s.async = true;
s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
t.parentNode.insertBefore(s, t);
})();
/* ]]> */
</script>
</head>
<body>
<script type="text/javascript">
//<![CDATA[
try{(function(a){var b="http://",c="www.questionablecontent.net",d="/cdn-cgi/cl/",e="img.gif",f=new a;f.src=[b,c,d,e].join("")})(Image)}catch(e){}
//]]>
</script>
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-17679175-1']);
_gaq.push(['_setDomainName', '.questionablecontent.net']);
_gaq.push(['_trackPageview']);

(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>

<div id="container" class="cg-hot">
<center>
<center>

<!-- Beginning of Project Wonderful ad code: -->
<!-- Ad box ID: 39770 -->
<script type="text/javascript">
<!--
var pw_d=document;
pw_d.projectwonderful_adbox_id = "39770";
pw_d.projectwonderful_adbox_type = "5";
pw_d.projectwonderful_foreground_color = "";
pw_d.projectwonderful_background_color = "";
//-->
</script>
<script type="text/javascript" src="http://www.projectwonderful.com/ad_display.js"></script>
<noscript><map name="admap39770" id="admap39770"><area href="http://www.projectwonderful.com/out_nojs.php?r=0&amp;c=0&amp;id=39770&amp;type=5" shape="rect" coords="0,0,728,90" title="" alt="" target="_blank" /></map>
<table cellpadding="0" border="0" cellspacing="0" width="728" bgcolor="#444444"><tr><td><img src="http://www.projectwonderful.com/nojs.php?id=39770&amp;type=5" width="728" height="90" usemap="#admap39770" border="0" alt="" /></td></tr><tr><td bgcolor="#444444" colspan="1"><center><a style="font-size:10px;color:#0000ff;text-decoration:none;line-height:1.2;font-weight:bold;font-family:Tahoma, verdana,arial,helvetica,sans-serif;text-transform: none;letter-spacing:normal;text-shadow:none;white-space:normal;word-spacing:normal;" href="http://www.projectwonderful.com/advertisehere.php?id=39770&amp;type=5" target="_blank">Ads by Project Wonderful! Your ad here, right now: $0</a></center></td></tr><tr><td colspan=1 valign="top" width=728 bgcolor="#000000" style="height:3px;font-size:1px;padding:0px;max-height:3px;"></td></tr></table>
</noscript>
<!-- End of Project Wonderful ad code. -->
</center>
</center>


<!-- Begin Project Wonderful ad code: -->
<!-- IMPORTANT: All lines, including these comments, must be included. -->
<!-- Removing or altering them could result in your ads being automatically shut down! -->
<!-- Ad box ID: 138 -->
<script language='JavaScript' type='text/javascript'>
<!--
r = new String (Math.random()*1000);
r = r.substr(0, 5);
s = new String ("<script language='JavaScript' type='text/javascript' ");
s += "src = http://www.projectwonderful.com/gen.php";
s += "?id=138&type=2";
s += "&r=" + r;
if (document.referrer){
s += "&referer=" + escape(document.referrer);
}
s += "><\/scr";
s += "ipt>";
document.write(s);
//-->
</script>
<noscript><MAP NAME="admap138"><AREA HREF="http://www.projectwonderful.com/out_nojs.php?r=0&c=0&id=138&type=2" SHAPE="rect" COORDS="0,0,117,30" title="" target="_blank"><AREA HREF="http://www.projectwonderful.com/out_nojs.php?r=1&c=0&id=138&type=2" SHAPE="rect" COORDS="0,30,117,60" title="" target="_blank"><AREA HREF="http://www.projectwonderful.com/out_nojs.php?r=2&c=0&id=138&type=2" SHAPE="rect" COORDS="0,60,117,90" title="" target="_blank"><AREA HREF="http://www.projectwonderful.com/out_nojs.php?r=3&c=0&id=138&type=2" SHAPE="rect" COORDS="0,90,117,120" title="" target="_blank"></MAP>
<table cellpadding=0 border=0 cellspacing=0 width=117 bgcolor="#666666"><tr><td><img src="http://www.projectwonderful.com/nojs.php?id=138&type=2" width=117 height=120 usemap="#admap138" border=0></td></tr><tr><td bgcolor="#666666" colspan=1><center><a style="font-size:10px;color:#ffffff;text-decoration:none;font-weight:bold;font-family:Tahoma, verdana,arial,helvetica,sans-serif;" href="http://www.projectwonderful.com/advertisehere.php?id=138&type=2" target="_blank">Your ad here, right now: as low as $0</center></td></tr></table>
</noscript>
<!-- End Project Wonderful ad code. -->

</p>

<script type="text/javascript"><!--
google_ad_client = "pub-0126922120845423";
/* 160x600, created 1/13/08 */
google_ad_slot = "5308843506";
google_ad_width = 160;
google_ad_height = 600;
//-->
</script>
<script type="text/javascript"
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>

</div>
<!-- Start Quantcast tag -->
<script type="text/javascript">
_qoptions={
qacct:"p-52tPwtcDlSoqU",
labels:"Pop Culture Channel"
};
</script>
<script type="text/javascript" src="http://ap.lijit.com/www/delivery/fpi.js?z=218214&u=qcontent&width=728&height=90"></script>
<div class="venue"></div>
</body>
</html>
<p align="center">
<div class="clear"> </div>
<script type="text/javascript"><!--
google_ad_client = "ca-pub-0126922120845423";
/* 728x90, created 1/10/08 */
google_ad_slot = "4226235551";
google_ad_width = 728;
google_ad_height = 90;
//-->
</script>
<script type="text/javascript"
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
File renamed without changes.

0 comments on commit 10b119e

Please sign in to comment.