From 8bb32ebea677de92196e6c3e12a55fc61d6f09ba Mon Sep 17 00:00:00 2001
From: Jay Wood <jerry@webdevstudios.com>
Date: Mon, 17 Nov 2014 10:17:11 -0500
Subject: [PATCH] Remove ALL references to colorbox

---
 class/main.class.php |  8 ++------
 inc/api.php          |  2 ++
 js/cwv3.js           | 47 +++++++++++++++++++++++++-------------------
 js/cwv3.min.js       |  2 +-
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/class/main.class.php b/class/main.class.php
index 26bb23d..27d2750 100644
--- a/class/main.class.php
+++ b/class/main.class.php
@@ -37,16 +37,12 @@ class CWV3 {
 	public function register_frontend_data() {
 		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
-		// Colorbox w/ MIT License
-		wp_register_style( 'colorbox', plugins_url( 'js/colorbox.1.5.14/colorbox.css', dirname( __FILE__ ) ), '', '1.5.10', 'ALL' ); // Keeping old css version
-		wp_register_script( 'colorbox_js', plugins_url( "js/colorbox.1.5.14/jquery.colorbox{$min}.js", dirname( __FILE__ ) ), array( 'jquery' ), '1.5.14', true );
-
 		// Jquery Cookie
 		wp_register_script( 'jquery_cookie', plugins_url( "js/jquery_cookie{$min}.js", dirname( __FILE__ ) ), array( 'jquery' ), '1.4.1', true );
 
 		// Main data
-		wp_register_script( 'cwv3_js', plugins_url( "js/cwv3{$min}.js", dirname( __FILE__ ) ), array( 'colorbox_js', 'jquery_cookie' ), '3.6.0', true );
-		wp_register_style( 'cwv3_css', plugins_url( "css/cwv3{$min}.css", dirname( __FILE__ ) ), array( 'colorbox' ), '1.0' );
+		wp_register_script( 'cwv3_js', plugins_url( "js/cwv3{$min}.js", dirname( __FILE__ ) ), array( 'jquery_cookie' ), '3.6.0', true );
+		wp_register_style( 'cwv3_css', plugins_url( "css/cwv3{$min}.css", dirname( __FILE__ ) ), '', '1.0' );
 	}
 
 	public function get_cookie_name(){
diff --git a/inc/api.php b/inc/api.php
index 7336db9..a3d1fd9 100644
--- a/inc/api.php
+++ b/inc/api.php
@@ -62,6 +62,7 @@ function cwv3_get_js_dialog(){
 
 	ob_start();
 	?>
+	<!-- CWV3 JS Dialog -->
 	<div id="cwv3_dialog" class="cwv3_dialog js">
 		<div class="cwv3 auth">
 			<div class="cwv3_title"><?php echo esc_attr( $cwv3_title ); ?></div>
@@ -85,6 +86,7 @@ function cwv3_get_js_dialog(){
 			</div>
 		</div>
 	</div>
+	<!-- END CWV3 JS Dialog -->
 	<?php
 	$dialog_output = ob_get_clean();
 	return apply_filters( 'cwv3_js_dialog_output', $dialog_output );
diff --git a/js/cwv3.js b/js/cwv3.js
index 78281e0..3e54797 100644
--- a/js/cwv3.js
+++ b/js/cwv3.js
@@ -5,10 +5,14 @@ window.cwv3 = ( function( window, document, $ ){
 
 	app.cache = function(){
 		app.$dialog = $('.cwv3_dialog');
-		app.$auth = app.$dialog.find( '.cwv3.auth' );
+		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.$exit   = app.$dialog.find( '.cwv3_exit' );
+		app.$enter  = app.$dialog.find( '.cwv3_enter' );
+		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;
+
+		$.colorbox.resize();
 	};
 
 	app.init = function(){
@@ -18,7 +22,11 @@ window.cwv3 = ( function( window, document, $ ){
 		$( 'body' ).on( 'click', '.cwv3_enter', app.enter_handler );
 		$( 'body' ).on( 'click', '.cwv3_exit', app.exit_handler );
 
-		var cookie_name = 'cwv3_cookie_' + cwv3_params.id;
+		if( app.cookie_name ){
+			// We need to set a cookie, so show the dialog.
+			app.show_popup();
+		}
+
 		
 	};
 
@@ -36,21 +44,20 @@ window.cwv3 = ( function( window, document, $ ){
 		// Set the cookie
 	};
 
-	app.show_colorbox = function(){
-		// Here we show colorbox
-		$.colorbox({
-			scrolling    : false,
-			overlayClose : false,
-			escKey       : false,
-			inline       : true,
-			href         : '#cwv3_dialog',
-			loop         : false,
-			className    : 'cwv3_dialog',
-			opacity      : cwv3_params.opacity,
-			onLoad       : function(){
-				$('#cboxClose').remove();
-			},
-		});
+	app.show_popup = function(){
+		
+	};
+
+	app.dialog_switch = function(){
+		var cookie_data = $.cookie( app.cookie_name );
+		if( 'denied' === cookie_data ){
+			//app.$auth.remove(); // Remove the main dialog
+			if( 'redirect' === cwv3_params.denial_method ){
+				window.location.replace( app.redirect_url );
+			}
+		} else if( undefined === cookie_data ){
+			// app.$denial.remove(); // Remove the denied box instead.
+		}
 	};
 
 	$( document ).ready( app.init );
@@ -107,4 +114,4 @@ jQuery(document).ready(function($) {
 	}
 	
 	
-});*/
\ No newline at end of file
+}); */
\ No newline at end of file
diff --git a/js/cwv3.min.js b/js/cwv3.min.js
index 465a051..9fcbf75 100644
--- a/js/cwv3.min.js
+++ b/js/cwv3.min.js
@@ -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.init=function(){app.cache(),$("body").on("click",".cwv3_enter",app.enter_handler),$("body").on("click",".cwv3_exit",app.exit_handler)},app.enter_handler=function(evt){evt.preventDefault()},app.exit_handler=function(evt){evt.preventDefault()},app.set_cookie=function(){},app.show_colorbox=function(){$.colorbox({scrolling:!1,overlayClose:!1,escKey:!1,inline:!0,href:"#cwv3_dialog",loop:!1,className:"cwv3_dialog",opacity:cwv3_params.opacity,onLoad:function(){$("#cboxClose").remove()}})},$(document).ready(app.init),app}(window,document,jQuery);
\ No newline at end of file
+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.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,$.colorbox.resize()},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.show_popup()},app.enter_handler=function(evt){evt.preventDefault()},app.exit_handler=function(evt){evt.preventDefault()},app.set_cookie=function(){},app.show_popup=function(){},app.dialog_switch=function(){var cookie_data=$.cookie(app.cookie_name);"denied"===cookie_data&&"redirect"===cwv3_params.denial_method&&window.location.replace(app.redirect_url)},$(document).ready(app.init),app}(window,document,jQuery);
\ No newline at end of file