Sophia/wp-cw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish cookie logic in js files, finally

Browse Source
This commit is contained in:
Jay Wood
2014-11-24 10:48:59 -05:00
parent 48ed975012
commit f4f97d03d8
3 changed files with 9 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
class/main.class.php
View File

@ -30,7 +30,7 @@ class CWV3 {
'cookie_name' => $this->get_cookie_name(), 'cookie_name' => $this->get_cookie_name(),
'cookie_time' => intval( $cookie_death ) > 365 ? 365 : intval( $cookie_death ), 'cookie_time' => intval( $cookie_death ) > 365 ? 365 : intval( $cookie_death ),
'denial_enabled' => get_option( 'cwv3_denial', 'enabled' ), 'denial_enabled' => get_option( 'cwv3_denial', 'enabled' ),
'denial_method' => get_option( 'cwv3_method_show', 'redirect' ), 'denial_method' => get_option( 'cwv3_method', 'redirect' ),
'redirect_url' => esc_js( get_option( 'cwv3_exit_link', '#' ) ), 'redirect_url' => esc_js( get_option( 'cwv3_exit_link', '#' ) ),
) ); ) );

59
js/cwv3.js
View File

@ -14,6 +14,7 @@ window.cwv3 = ( function( window, document, $ ){
app.$overlay = $( '.cwv3.dialog-overlay' ); app.$overlay = $( '.cwv3.dialog-overlay' );
app.cookie_name = ( '' !== cwv3_params.cookie_name ) ? 'cwv3_cookie_' + cwv3_params.cookie_name : false; app.cookie_name = ( '' !== cwv3_params.cookie_name ) ? 'cwv3_cookie_' + cwv3_params.cookie_name : false;
app.redirect_url = ( '' === cwv3_params.redirect_url || '#' === cwv3_params.redirect_url ) ? 'http://google.com' : cwv3_params.redirect_url; app.redirect_url = ( '' === cwv3_params.redirect_url || '#' === cwv3_params.redirect_url ) ? 'http://google.com' : cwv3_params.redirect_url;
app.cookie_data = $.cookie( app.cookie_name );
}; };
app.init = function(){ app.init = function(){
@ -45,7 +46,9 @@ window.cwv3 = ( function( window, document, $ ){
// opacity cookie_path cookie_name cookie_time denial_enabled denial_method redirect_url // opacity cookie_path cookie_name cookie_time denial_enabled denial_method redirect_url
app.exit_handler = function( evt ){ app.exit_handler = function( evt ){
evt.preventDefault(); evt.preventDefault();
if( 'denied' !== app.cookie_data ){
app.set_cookie( 'exit' ); app.set_cookie( 'exit' );
}
var $exit_url = app.$exit.find( 'a' ).attr( 'href' ); var $exit_url = app.$exit.find( 'a' ).attr( 'href' );
if( '#' === $exit_url || '' === $exit_url ){ if( '#' === $exit_url || '' === $exit_url ){
window.location.replace( 'http://google.com' ); window.location.replace( 'http://google.com' );
@ -70,16 +73,14 @@ window.cwv3 = ( function( window, document, $ ){
}; };
app.dialog_switch = function(){ app.dialog_switch = function(){
var cookie_data = $.cookie( app.cookie_name ); if( 'denied' === app.cookie_data ){
console.log( app.cookie_name );
if( 'denied' === cookie_data ){
app.$auth.remove(); // Remove the main dialog app.$auth.remove(); // Remove the main dialog
if( 'redirect' === cwv3_params.denial_method ){ if( 'redirect' === cwv3_params.denial_method ){
window.location.replace( app.redirect_url ); window.location.replace( app.redirect_url );
} else { } else {
app.show_popup(); app.show_popup();
} }
} else if( undefined === cookie_data ){ } else if( undefined === app.cookie_data ){
app.$denial.remove(); // Remove the denied box instead. app.$denial.remove(); // Remove the denied box instead.
app.show_popup(); app.show_popup();
} }
@ -96,53 +97,3 @@ window.cwv3 = ( function( window, document, $ ){
return app; return app;
})( window, document, jQuery ); })( window, document, jQuery );
/*
jQuery(document).ready(function($) {
var enter = $('#cw_enter_link');
var exit = $('#cw_exit_link');
if(cwv3_params.sd === "1"){
$.colorbox(
{
scrolling: false,
overlayClose: false,
escKey: false,
inline: true,
href: '#cwv3_auth',
maxWidth: '80%',
loop: false,
onLoad: function(){
$('#cboxClose').remove();
},
className: 'cwv3_box',
opacity: cwv3_params.opacity
}
);
enter.click(function(e){
if( typeof(e) !== "undefined" ){
e.preventDefault();
}
$.post(cwv3_params.admin_url, {action: cwv3_params.action, nonce: cwv3_params.nonce, id: cwv3_params.id, method: 'enter'}, function(){
if(cwv3_params.enter === "#"){
$.colorbox.close();
}else{
window.location = cwv3_params.enter;
}
});
});
exit.click(function(e){
if( typeof(e) !== "undefined" ){
e.preventDefault();
}
$.post(cwv3_params.admin_url, {action: cwv3_params.action, nonce: cwv3_params.nonce, id: cwv3_params.id, method: 'exit'}, function(){
window.location = cwv3_params.exit;
});
});
}
}); */

2
js/cwv3.min.js vendored
View File

@ -1 +1 @@
window.cwv3=function(window,document,$){var app={};return app.cache=function(){app.$dialog=$(".cwv3_dialog"),app.$auth=app.$dialog.find(".cwv3.auth"),app.$denial=app.$dialog.find(".cwv3.denied"),app.$exit=app.$dialog.find(".cwv3_exit"),app.$enter=app.$dialog.find(".cwv3_enter"),app.$overlay=$(".cwv3.dialog-overlay"),app.cookie_name=""!==cwv3_params.cookie_name?"cwv3_cookie_"+cwv3_params.cookie_name:!1,app.redirect_url=""===cwv3_params.redirect_url||"#"===cwv3_params.redirect_url?"http://google.com":cwv3_params.redirect_url},app.init=function(){app.cache(),$("body").on("click",".cwv3_enter",app.enter_handler),$("body").on("click",".cwv3_exit",app.exit_handler),app.cookie_name&&app.dialog_switch()},app.enter_handler=function(evt){evt.preventDefault(),app.set_cookie("enter");var $enter_url=app.$enter.find("a").attr("href");"#"===$enter_url||""===$enter_url?app.close_handler():window.location.replace($enter_url)},app.exit_handler=function(evt){evt.preventDefault(),app.set_cookie("exit");var $exit_url=app.$exit.find("a").attr("href");window.location.replace("#"===$exit_url||""===$exit_url?"http://google.com":$exit_url)},app.set_cookie=function(method){method="exit"===method?"denied":!0,$.cookie(app.cookie_name,method,{expires:parseInt(cwv3_params.cookie_time),path:cwv3_params.cookie_path})},app.close_handler=function(){app.$dialog.fadeOut(100,function(){app.$overlay.fadeOut(100)})},app.dialog_switch=function(){var cookie_data=$.cookie(app.cookie_name);console.log(app.cookie_name),"denied"===cookie_data?(app.$auth.remove(),"redirect"===cwv3_params.denial_method?window.location.replace(app.redirect_url):app.show_popup()):void 0===cookie_data&&(app.$denial.remove(),app.show_popup())},app.show_popup=function(){app.$overlay.fadeIn(200,function(){app.$dialog.fadeIn(100)})},$(document).ready(app.init),app}(window,document,jQuery); window.cwv3=function(window,document,$){var app={};return app.cache=function(){app.$dialog=$(".cwv3_dialog"),app.$auth=app.$dialog.find(".cwv3.auth"),app.$denial=app.$dialog.find(".cwv3.denied"),app.$exit=app.$dialog.find(".cwv3_exit"),app.$enter=app.$dialog.find(".cwv3_enter"),app.$overlay=$(".cwv3.dialog-overlay"),app.cookie_name=""!==cwv3_params.cookie_name?"cwv3_cookie_"+cwv3_params.cookie_name:!1,app.redirect_url=""===cwv3_params.redirect_url||"#"===cwv3_params.redirect_url?"http://google.com":cwv3_params.redirect_url,app.cookie_data=$.cookie(app.cookie_name)},app.init=function(){app.cache(),$("body").on("click",".cwv3_enter",app.enter_handler),$("body").on("click",".cwv3_exit",app.exit_handler),app.cookie_name&&app.dialog_switch()},app.enter_handler=function(evt){evt.preventDefault(),app.set_cookie("enter");var $enter_url=app.$enter.find("a").attr("href");"#"===$enter_url||""===$enter_url?app.close_handler():window.location.replace($enter_url)},app.exit_handler=function(evt){evt.preventDefault(),"denied"!==app.cookie_data&&app.set_cookie("exit");var $exit_url=app.$exit.find("a").attr("href");window.location.replace("#"===$exit_url||""===$exit_url?"http://google.com":$exit_url)},app.set_cookie=function(method){method="exit"===method?"denied":!0,$.cookie(app.cookie_name,method,{expires:parseInt(cwv3_params.cookie_time),path:cwv3_params.cookie_path})},app.close_handler=function(){app.$dialog.fadeOut(100,function(){app.$overlay.fadeOut(100)})},app.dialog_switch=function(){"denied"===app.cookie_data?(app.$auth.remove(),"redirect"===cwv3_params.denial_method?window.location.replace(app.redirect_url):app.show_popup()):void 0===app.cookie_data&&(app.$denial.remove(),app.show_popup())},app.show_popup=function(){app.$overlay.fadeIn(200,function(){app.$dialog.fadeIn(100)})},$(document).ready(app.init),app}(window,document,jQuery);