From 6a0888a46faf784b957825497c81f2bf6ba6c47b Mon Sep 17 00:00:00 2001 From: jaywood Date: Wed, 9 Jul 2014 20:49:03 -0400 Subject: [PATCH] Sync with current wp version --- class/main.class.php | 235 ++++++++++++++++++++++---- content-warning-v3.php | 7 +- css/admin_style.css | 1 - css/cwv3.css | 2 - css/cwv3_admin.css | 1 - inc/options.inc.php | 14 +- js/colorbox.1.4.14/colorbox.css | 3 - js/colorbox.1.4.14/jquery.colorbox.js | 82 --------- js/cwv3.js | 20 ++- 9 files changed, 227 insertions(+), 138 deletions(-) diff --git a/class/main.class.php b/class/main.class.php index 72e4a3c..81d96ea 100644 --- a/class/main.class.php +++ b/class/main.class.php @@ -20,6 +20,63 @@ class CWV3{ // AJAX Handle add_action('wp_ajax_cwv3_ajax', array(&$this, 'handle_ajax')); add_action('wp_ajax_nopriv_cwv3_ajax', array(&$this, 'handle_ajax')); + + // Post column filters + add_filter('manage_page_posts_columns', array(&$this, 'post_cols')); + add_filter('manage_post_posts_columns', array(&$this, 'post_cols')); + + + //add_action('quick_edit_custom_box', array(&$this, 'display_qe'), 10, 2); + + // Post column info + add_action('manage_posts_custom_column', array(&$this, 'set_col_data')); + add_action('manage_pages_custom_column', array(&$this, 'set_col_data')); + + add_action('admin_head', array(&$this, 'render_lazy_mans_css')); + + add_action('wp_head', array(&$this, 'override_css')); + } + + public function override_css(){ + + $img = get_option('cwv3_bg_image', ''); + $color = get_option('cwv3_bg_color'); + ?>th#cwv2{width: 32px; text-align:center;} td.column-cwv2{text-align:center;}'; + } + + public function set_col_data($col){ + global $post; + + $sw = get_option('cwv3_sitewide'); + switch($col){ + case 'cwv2': + if(get_post_meta($post->ID, 'cwv3_auth', true) == 'yes' || $sw[0] == 'enabled'){ + echo 'Yes'; + }else{ + echo 'No'; + } + break; + } + } + + public function post_cols($cols){ + + return array_slice($cols, 0,1,true)+array('cwv2'=> 'CW')+array_slice($cols, 1, count($array)-1, true); + } public function cw_meta(){ @@ -56,37 +113,40 @@ class CWV3{ check_ajax_referer('cwv3_ajax_'.$post_id, 'nonce'); - $sw = get_option('cwv3_sitewide') == 'enabled' ? true : false; - $cData = json_decode($_COOKIE['cwv3_auth']); - $time = get_option('cwv3_death'); - $time = time()+($time['multiplier']*$time['time']); if($_POST['method'] == 'exit'){ - if(get_option('cwv3_denial') == 'enabled'){ - + $d = get_option('cwv3_denial'); + if($d[0] == 'enabled'){ + $resp = $this->set_cookie($post_id, 3); } + $resp = "denied"; + }else{ + $resp = $this->set_cookie($post_id, 1); } - + echo $resp; die; } public function load_dependancies(){ global $post; + if(current_user_can('manage_options')) return; + wp_enqueue_style('cwv3_css'); wp_enqueue_script('cwv3_js'); $elink = get_option('cwv3_enter_link'); $exlink = get_option('cwv3_exit_link'); $p_ID = (is_home()) ? -1 : (is_attachment() ? $post->post_parent : (is_archive() || is_search()) ? -2 : $post->ID); - + $d = get_option('cwv3_denial'); wp_localize_script('cwv3_js', 'cwv3_params', array( 'action' => 'cwv3_ajax', 'nonce' => wp_create_nonce('cwv3_ajax_'.$p_ID), 'admin_url' => admin_url( 'admin-ajax.php' ), 'id' => $p_ID, - 'sd' => ($this->check_data() !== true) ? true : false, + 'sd' => ($this->check_data() == false || ($this->check_data() == 3 && $d[0] == 'enabled')) ? true : false, 'enter' => !empty($elink) ? $elink : '#', - 'exit' => !empty($exlink) ? $exlink : 'http://google.com' + 'exit' => !empty($exlink) ? $exlink : 'http://google.com', + 'opacity' => get_option('cwv3_bg_opacity', 0.85) )); } @@ -96,16 +156,65 @@ class CWV3{ wp_register_script('colorbox_js', plugins_url('js/colorbox.1.4.14/jquery.colorbox-min.js', dirname(__FILE__)), array('jquery'), '1.4.14', true); // Main data - wp_register_script('cwv3_js', plugins_url('js/cwv3.js', dirname(__FILE__)), array('colorbox_js'), '1.0', true); + wp_register_script('cwv3_js', plugins_url('js/cwv3.js', dirname(__FILE__)), array('colorbox_js'), uniqid(), true); wp_register_style('cwv3_css', plugins_url('css/cwv3.css', dirname(__FILE__)), array('colorbox'), '1.0'); } public function set_cookie($id, $action){ - $cData = json_decode($_COOKIE['cwv3_auth']); - $cData[$id] = $action; $time = get_option('cwv3_death'); - setcookie('cwv3_auth', json_encode($cData), ($time['multiplier'] * $time['time'])+time(),'/', COOKIE_DOMAIN, false); + + $sw = get_option('cwv3_sitewide'); + $hm = get_option('cwv3_homepage'); + $mi = get_option('cwv3_misc'); + if(get_magic_quotes_gpc() == true){ + $cData = array( + 'pages'=> json_decode(stripslashes($_COOKIE['cwv3_pages'])), + 'posts' => json_decode(stripslashes($_COOKIE['cwv3_posts'])), + 'categories' => json_decode(stripslashes($_COOKIE['cwv3_cats'])) + ); + }else{ + $cData = array( + 'pages' => json_decode($_COOKIE['cwv3_pages']), + 'posts' => json_decode($_COOKIE['cwv3_posts']), + 'categories' => json_decode($_COOKIE['cwv3_cats']) + ); + } + if($sw[0] == 'enabled'){ + $cData['pages']->sitewide = $action; + return setcookie('cwv3_pages', json_encode($cData['pages']), ($time['multiplier'] * $time['time'])+time(),COOKIEPATH, COOKIE_DOMAIN, false); + } + + if($hm[0] == 'enabled' && $id == -1){ + $cData['pages']->home = $action; + return setcookie('cwv3_pages', json_encode($cData['pages']), ($time['multiplier'] * $time['time'])+time(),COOKIEPATH, COOKIE_DOMAIN, false); + } + + if($mi[0] == 'enabled' && $id == -2){ + $cData['pages']->other = $action; + //return print_r($cData, true); + return setcookie('cwv3_pages', json_encode($cData['pages']), ($time['multiplier'] * $time['time'])+time(),COOKIEPATH, COOKIE_DOMAIN, false); + } + + $type = get_post_type($id); + if($type == 'post'){ + $catData = get_option("cwv3_cat_list"); + $curCat = get_the_category($id); + if($this->inCat($catData, $curCat)){ + $cData['categories']->$id = $action; + return setcookie('cwv3_cats', json_encode($cData['categories']), ($time['multiplier'] * $time['time'])+time(),COOKIEPATH, COOKIE_DOMAIN, false); + }else if(get_post_meta($id, 'cwv3_auth', true) == 'yes'){ + $cData['posts']->$id = $action; + return setcookie('cwv3_posts', json_encode($cData['posts']), ($time['multiplier'] * $time['time'])+time(),COOKIEPATH, COOKIE_DOMAIN, false); + } + } + + if(get_post_meta($id, 'cwv3_auth', true) == 'yes'){ + $cData['pages']->$id = $action; + return setcookie('cwv3_pages', json_encode($cData['pages']), ($time['multiplier'] * $time['time'])+time(),COOKIEPATH, COOKIE_DOMAIN, false); + } + + return 'Failed to set cookie.'; } public function check_data(){ @@ -115,26 +224,32 @@ class CWV3{ //Don't want to hender the feed, just in case. return true; } + $cData = array( + 'pages'=> json_decode(stripslashes($_COOKIE['cwv3_pages']), true), + 'posts' => json_decode(stripslashes($_COOKIE['cwv3_posts']), true), + 'categories' => json_decode(stripslashes($_COOKIE['cwv3_cats']), true) + ); + + //return print_r($cData, true); - $cData = json_decode($_COOKIE['cwv3_auth']); $sw = get_option('cwv3_sitewide'); $hm = get_option('cwv3_homepage'); $mi = get_option('cwv3_misc'); if($sw[0] == 'enabled'){ - return (!empty($cData['sitewide']) ? $cData['sitewide'] : false); + return (!empty($cData['pages']['sitewide']) ? $cData['pages']['sitewide'] : false); } - + if(is_home() && $hm[0] == 'enabled'){ - return (!empty($cData['-1']) ? $cData['-1'] : false); + return (!empty($cData['pages']['home']) ? $cData['pages']['home'] : false); } if((is_archive() || is_search()) && $mi[0] == 'enabled'){ // Protect misc pages aswell - return (!empty($cData['-2']) ? $cData['-2'] : false); + return (!empty($cData['pages']['other']) ? $cData['pages']['other'] : false); } - if(is_page()){ + if(is_page() && get_post_meta($post->ID, 'cwv3_auth', true) == 'yes'){ $c = $cData['pages'][$post->ID]; return(!empty($c) ? $c : false); } @@ -143,31 +258,47 @@ class CWV3{ // First see if categories are setup in the admin side. $catData = get_option("cwv3_cat_list"); $curCat = get_the_category($id); - if(in_array($curCat, $catData)){ + if(get_post_type($id) == 'post' && $this->inCat($catData, $curCat)){ // If the current category is selected in the admin page, that means the administrator wishes to protect it. // respect the admin's wishes and do it. - return(!empty($cData['categories'][$post->id]) ? $cData['categories'][$id] : false ); + return(!empty($cData['categories'][$post->ID]) ? $cData['categories'][$id] : false ); } // Since that's not the case, we need to check post_meta data and see if this post is protected. - if(get_post_meta($post->ID, 'cwv3_auth', true) == 'yes'){ + if(get_post_meta($post->ID, 'cwv3_auth', true) == 'yes' && !is_home()){ return(!empty($cData['posts'][$post->ID]) ? $cData['posts'][$id] : false ); } - return true; + return 'failed all checks'; + } + + public function inCat($catIDs, $catArray){ + if(!is_array($catIDs)){ + $catIDs = array(); // Empty + } + + foreach($catArray as $cat){ + if(in_array($cat->term_id, $catIDs)){return true;}else{continue;} + } + return false; } public function renderDialog(){ - $dtype = $this->check_data(); + $d = get_option('cwv3_denial'); + if($this->check_data() == 3 && $d[0] == 'enabled'){ + $dtype = true; + }else{ + $dtype = false; + } $etxt = get_option('cwv3_enter_txt'); $extxt = get_option('cwv3_exit_txt'); ?>
-
-
-
+
+
+
@@ -176,18 +307,56 @@ class CWV3{ public function render_metabox($post){ wp_nonce_field(plugin_basename(__FILE__), 'cwv3_meta'); - - $curval = get_post_meta($post->ID, 'cwv3_auth', true);?> + $curval = get_post_meta($post->ID, 'cwv3_auth', true); + $sw = get_option('cwv3_sitewide'); + $disabled = $sw[0] == 'enabled' ? 'disabled="disabled"' : ''; + + + ?> - value="yes"/> + value="yes" />
+ +

Cannot be changed while site wide option is enabled.

+ +
+
+ +
+
+ \ No newline at end of file diff --git a/content-warning-v3.php b/content-warning-v3.php index ebcdd6d..2175809 100644 --- a/content-warning-v3.php +++ b/content-warning-v3.php @@ -1,18 +1,15 @@ uninstall() ); - ?> \ No newline at end of file diff --git a/css/admin_style.css b/css/admin_style.css index de1504e..cfdcd07 100644 --- a/css/admin_style.css +++ b/css/admin_style.css @@ -1,2 +1 @@ /* CSS Document */ - diff --git a/css/cwv3.css b/css/cwv3.css index 4969298..4ec323c 100644 --- a/css/cwv3.css +++ b/css/cwv3.css @@ -1,9 +1,7 @@ /* CSS Document */ .cwv3_box{background: transparent;} - /* Undocumented cBox colors */ #cboxLoadingOverlay, #cboxContent, #cboxLoadedContent{background-color: #FFF !important;} - #cwv3_auth{border: 3px solid #ccc; background: #FFF;} #cwv3_auth div{padding: 0.25em} #cwv3_title{color: #FFF; font-weight: bold; text-align:center; background: #f00;} diff --git a/css/cwv3_admin.css b/css/cwv3_admin.css index de1504e..cfdcd07 100644 --- a/css/cwv3_admin.css +++ b/css/cwv3_admin.css @@ -1,2 +1 @@ /* CSS Document */ - diff --git a/inc/options.inc.php b/inc/options.inc.php index 4595ab9..9500faf 100644 --- a/inc/options.inc.php +++ b/inc/options.inc.php @@ -1,5 +1,4 @@ array( 'name' => 'Background Opacity', - 'desc' => 'Input a number from 0-100, the latter being completely opaque.', - 'type' => 'text', - 'def' => 75 + 'desc' => 'Input a float value from 0-1, the latter being completely opaque.', + 'type' => 'number', + 'def' => 0.85, + 'step' => 0.01 ), 'bg_color' => array( 'name' => 'Background Color', @@ -143,6 +143,12 @@ $cwv3_op_data = array( 'type' => 'color', 'fields' => array('color'=>'#000000') ), + 'css' => array( + 'name' => 'Custom CSS', + 'desc' => 'For a completely custom look, just drop your css here.', + 'type' => 'textbox', + 'def' => '' + ), 'cat_list' => array( 'name' => 'Category restrictions', 'desc' => 'Select categories that you would like to restrict with the dialog.', diff --git a/js/colorbox.1.4.14/colorbox.css b/js/colorbox.1.4.14/colorbox.css index b463110..e4c2faa 100644 --- a/js/colorbox.1.4.14/colorbox.css +++ b/js/colorbox.1.4.14/colorbox.css @@ -13,7 +13,6 @@ .cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;} .cboxIframe{width:100%; height:100%; display:block; border:0;} #colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;} - /* User Style: Change the following styles to modify the appearance of Colorbox. They are @@ -29,13 +28,11 @@ #cboxLoadingOverlay{background:#000;} #cboxTitle{position:absolute; top:-22px; left:0; color:#000;} #cboxCurrent{position:absolute; top:-22px; right:205px; text-indent:-9999px;} - /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */ #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; text-indent:-9999px; width:20px; height:20px; position:absolute; top:-20px; background:url(images/controls.png) no-repeat 0 0;} /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */ #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;} - #cboxPrevious{background-position:0px 0px; right:44px;} #cboxPrevious:hover{background-position:0px -25px;} #cboxNext{background-position:-25px 0px; right:22px;} diff --git a/js/colorbox.1.4.14/jquery.colorbox.js b/js/colorbox.1.4.14/jquery.colorbox.js index 77cd730..62d6279 100644 --- a/js/colorbox.1.4.14/jquery.colorbox.js +++ b/js/colorbox.1.4.14/jquery.colorbox.js @@ -37,7 +37,6 @@ retinaImage: false, retinaUrl: false, retinaSuffix: '@2x.$1', - // internationalization current: "image {current} of {total}", previous: "previous", @@ -45,7 +44,6 @@ close: "close", xhrError: "This content failed to load.", imgError: "This image failed to load.", - open: false, returnFocus: true, reposition: true, @@ -56,7 +54,6 @@ slideshowStart: "start slideshow", slideshowStop: "stop slideshow", photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico)((#|\?).*)?$/i, - onOpen: false, onLoad: false, onComplete: false, @@ -85,7 +82,6 @@ event_cleanup = prefix + '_cleanup', event_closed = prefix + '_closed', event_purge = prefix + '_purge', - // Cached jQuery Object Variables $overlay, $box, @@ -127,7 +123,6 @@ className, requests = 0, init; - // **************** // HELPER FUNCTIONS // **************** @@ -135,15 +130,12 @@ // Convience function for creating new jQuery objects function $tag(tag, id, css) { var element = document.createElement(tag); - if (id) { element.id = prefix + id; } - if (css) { element.style.cssText = css; } - return $(element); } @@ -152,7 +144,6 @@ function winheight() { return window.innerHeight ? window.innerHeight : $(window).height(); } - // Determine the next and previous members in a group. function getIndex(increment) { var @@ -161,7 +152,6 @@ return (newIndex < 0) ? max + newIndex : newIndex; } - // Convert '%' and 'px' values to integers function setSize(size, dimension) { return Math.round((/%/.test(size) ? ((dimension === 'x' ? $window.width() : winheight()) / 100) : 1) * parseInt(size, 10)); @@ -172,18 +162,15 @@ function isImage(settings, url) { return settings.photo || settings.photoRegex.test(url); } - function retinaUrl(settings, url) { return settings.retinaUrl && window.devicePixelRatio > 1 ? url.replace(settings.photoRegex, settings.retinaSuffix) : url; } - function trapFocus(e) { if ('contains' in $box[0] && !$box[0].contains(e.target)) { e.stopPropagation(); $box.focus(); } } - // Assigns function results to their respective properties function makeSettings() { var i, @@ -212,19 +199,15 @@ settings.href = $.trim(settings.href); } } - function trigger(event, callback) { // for external use $(document).trigger(event); - // for internal use $events.trigger(event); - if ($.isFunction(callback)) { callback.call(element); } } - // Slideshow functionality function slideshow() { var @@ -240,24 +223,20 @@ clear = function () { clearTimeout(timeOut); }; - set = function () { if (settings.loop || $related[index + 1]) { timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed); } }; - start = function () { $slideshow .html(settings.slideshowStop) .unbind(click) .one(click, stop); - $events .bind(event_complete, set) .bind(event_load, clear) .bind(event_cleanup, stop); - $box.removeClass(className + "off").addClass(className + "on"); }; @@ -276,7 +255,6 @@ publicMethod.next(); start(); }); - $box.removeClass(className + "on").addClass(className + "off"); }; @@ -289,7 +267,6 @@ $box.removeClass(className + "off " + className + "on"); } } - function launch(target) { if (!closing) { @@ -305,7 +282,6 @@ $related = $('.' + boxElement).filter(function () { var data = $.data(this, colorbox), relRelated; - if (data) { relRelated = $(this).data('rel') || data.rel || this.rel; } @@ -327,7 +303,6 @@ visibility: 'visible' }).show(); - if (className) { $box.add($overlay).removeClass(className); } @@ -335,9 +310,7 @@ $box.add($overlay).addClass(settings.className); } className = settings.className; - $close.html(settings.close).show(); - if (!open) { open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys. @@ -345,7 +318,6 @@ $box.css({visibility:'hidden', display:'block'}); $loaded = $tag(div, 'LoadedContent', 'width:0; height:0; overflow:hidden').appendTo($content); - // Cache values needed for size calculations interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height(); interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width(); @@ -357,26 +329,21 @@ settings.w = setSize(settings.initialWidth, 'x'); settings.h = setSize(settings.initialHeight, 'y'); publicMethod.position(); - slideshow(); - trigger(event_open, settings.onOpen); $groupControls.add($title).hide(); - $box.focus(); // Confine focus to the modal // Uses event capturing that is not supported in IE8- if (document.addEventListener) { - document.addEventListener('focus', trapFocus, true); $events.one(event_closed, function () { document.removeEventListener('focus', trapFocus, true); }); } - // Return focus on closing if (settings.returnFocus) { $events.one(event_closed, function () { @@ -388,7 +355,6 @@ load(); } } - // Colorbox's markup needs to be added to the DOM prior to being called // so that the browser will go ahead and load the CSS background images. function appendHTML() { @@ -435,11 +401,9 @@ $loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none'); $groupControls = $next.add($prev).add($current).add($slideshow); - $(document.body).append($overlay, $box.append($wrap, $loadingBay)); } } - // Add Colorbox's event bindings function addBindings() { function clickHandler(e) { @@ -450,11 +414,9 @@ launch(this); } } - if ($box) { if (!init) { init = true; - // Anonymous functions here keep the public method from being cached, thereby allowing them to be redefined on the fly. $next.click(function () { publicMethod.next(); @@ -488,7 +450,6 @@ } } }); - if ($.isFunction($.fn.on)) { // For jQuery 1.7+ $(document).on('click.'+prefix, '.'+boxElement, clickHandler); @@ -503,16 +464,12 @@ } return false; } - // Don't do anything if Colorbox already exists. if ($.colorbox) { return; } - // Append the HTML when the DOM loads $(appendHTML); - - // **************** // PUBLIC FUNCTIONS // Usage format: $.colorbox.close(); @@ -525,7 +482,6 @@ options = options || {}; appendHTML(); - if (addBindings()) { if ($.isFunction($this)) { // assume a call to $.colorbox $this = $(''); @@ -549,7 +505,6 @@ return $this; }; - publicMethod.position = function (speed, loadedCallback) { var css, @@ -560,13 +515,10 @@ scrollLeft; $window.unbind('resize.' + prefix); - // remove the modal so that it doesn't influence the document width/height $box.css({top: -9e4, left: -9e4}); - scrollTop = $window.scrollTop(); scrollLeft = $window.scrollLeft(); - if (settings.fixed) { offset.top -= scrollTop; offset.left -= scrollLeft; @@ -576,7 +528,6 @@ left = scrollLeft; $box.css({position: 'absolute'}); } - // keeps the top and left positions within the browser's viewport. if (settings.right !== false) { left += Math.max($window.width() - settings.w - loadedWidth - interfaceWidth - setSize(settings.right, 'x'), 0); @@ -593,9 +544,7 @@ } else { top += Math.round(Math.max(winheight() - settings.h - loadedHeight - interfaceHeight, 0) / 2); } - $box.css({top: offset.top, left: offset.left, visibility:'visible'}); - // setting the speed to 0 to reduce the delay between same-sized content. speed = ($box.width() === settings.w + loadedWidth && $box.height() === settings.h + loadedHeight) ? 0 : speed || 0; @@ -608,9 +557,7 @@ $topBorder[0].style.width = $bottomBorder[0].style.width = $content[0].style.width = (parseInt(that.style.width,10) - interfaceWidth)+'px'; $content[0].style.height = $leftBorder[0].style.height = $rightBorder[0].style.height = (parseInt(that.style.height,10) - interfaceHeight)+'px'; } - css = {width: settings.w + loadedWidth + interfaceWidth, height: settings.h + loadedHeight + interfaceHeight, top: top, left: left}; - if(speed===0){ // temporary workaround to side-step jQuery-UI 1.8 bug (http://bugs.jquery.com/ticket/12273) $box.css(css); } @@ -630,7 +577,6 @@ $window.bind('resize.' + prefix, publicMethod.position); }, 1); } - if (loadedCallback) { loadedCallback(); } @@ -640,7 +586,6 @@ } }); }; - publicMethod.resize = function (options) { if (open) { options = options || {}; @@ -668,16 +613,13 @@ publicMethod.position(settings.transition === "none" ? 0 : settings.speed); } }; - publicMethod.prep = function (object) { if (!open) { return; } var callback, speed = settings.transition === "none" ? 0 : settings.speed; - $loaded.empty().remove(); // Using empty first may prevent some IE7 issues. - $loaded = $tag(div, 'LoadedContent').append(object); function getWidth() { @@ -702,7 +644,6 @@ // floating the IMG removes the bottom line-height and fixed a problem where IE miscalculates the width of the parent element as 100% of the document width. $(photo).css({'float': 'none'}); - callback = function () { var total = $related.length, iframe, @@ -725,7 +666,6 @@ $loadingOverlay.hide(); trigger(event_complete, settings.onComplete); }; - $title.html(settings.title).add($loaded).show(); @@ -748,7 +688,6 @@ img, i = $related[this], data = $.data(i, colorbox); - if (data && data.href) { src = data.href; if ($.isFunction(src)) { @@ -757,7 +696,6 @@ } else { src = $(i).attr('href'); } - if (src && isImage(data, src)) { src = retinaUrl(data, src); img = new Image(); @@ -779,7 +717,6 @@ if (allowTransparency in iframe) { iframe[allowTransparency] = "true"; } - if (!settings.scrolling) { iframe.scrolling = "no"; } @@ -799,7 +736,6 @@ $events.one(event_purge, function () { iframe.src = "//about:blank"; }); - if (settings.fastIframe) { $(iframe).trigger('load'); } @@ -822,7 +758,6 @@ publicMethod.position(speed, callback); } }; - function load () { var href, setResize, prep = publicMethod.prep, $inline, request = ++requests; @@ -871,11 +806,9 @@ // Inserts an empty placeholder where inline content is being pulled from. // An event is bound to put inline content back when Colorbox closes or loads new content. $inline = $tag(div).hide().insertBefore($(href)[0]); - $events.one(event_purge, function () { $inline.replaceWith($loaded.children()); }); - prep($(href)); } else if (settings.iframe) { // IFrame element won't be added to the DOM until it is ready to be displayed, @@ -884,9 +817,7 @@ } else if (settings.html) { prep(settings.html); } else if (isImage(settings, href)) { - href = retinaUrl(settings, href); - $(photo = new Image()) .addClass(prefix + 'Photo') .bind('error',function () { @@ -895,18 +826,14 @@ }) .one('load', function () { var percent; - if (request !== requests) { return; } - photo.alt = $(element).attr('alt') || $(element).attr('data-alt') || ''; - if (settings.retinaImage && window.devicePixelRatio > 1) { photo.height = photo.height / window.devicePixelRatio; photo.width = photo.width / window.devicePixelRatio; } - if (settings.scalePhotos) { setResize = function () { photo.height -= photo.height * percent; @@ -932,10 +859,8 @@ publicMethod.next(); }; } - photo.style.width = photo.width + 'px'; photo.style.height = photo.height + 'px'; - setTimeout(function () { // A pause because Chrome will sometimes report a 0 by 0 size otherwise. prep(photo); }, 1); @@ -967,7 +892,6 @@ launch($related[index]); } }; - // Note: to use this within an iframe use the following format: parent.jQuery.colorbox.close(); publicMethod.close = function () { if (open && !closing) { @@ -997,11 +921,9 @@ }); } }; - // Removes changes Colorbox made to the document, but does not remove the plugin. publicMethod.remove = function () { if (!$box) { return; } - $box.stop(); $.colorbox.close(); $box.stop().remove(); @@ -1011,16 +933,12 @@ $('.' + boxElement) .removeData(colorbox) .removeClass(boxElement); - $(document).unbind('click.'+prefix); }; - // A method for fetching the current element Colorbox is referencing. // returns a jQuery object. publicMethod.element = function () { return $(element); }; - publicMethod.settings = defaults; - }(jQuery, document, window)); diff --git a/js/cwv3.js b/js/cwv3.js index d20318e..b1bbd67 100644 --- a/js/cwv3.js +++ b/js/cwv3.js @@ -1,9 +1,9 @@ // JavaScript Document jQuery(document).ready(function($) { var wpdata = cwv3_params; - - var enter = $('cw_enter_link'); - var exit = $('cw_exit_link'); + //console.log(wpdata); + var enter = $('#cw_enter_link'); + var exit = $('#cw_exit_link'); if(wpdata.sd == true){ var cboxObj = $.colorbox( @@ -19,19 +19,25 @@ jQuery(document).ready(function($) { onLoad: function(){ $('#cboxClose').remove(); }, - className: 'cwv3_box' + className: 'cwv3_box', + opacity: cwv3_params.opacity } ); - + enter.click(function(e){ + //console.log(e); $.post(wpdata.admin_url, {action: wpdata.action, nonce: wpdata.nonce, id: wpdata.id, method: 'enter'}, function(e){ - // Deal with the response from the 'entry' handler. + if(cwv3_params.enter == "#"){ + $.colorbox.close(); + }else{ + window.location = wpdata.enter; + } }); }); exit.click(function(e){ $.post(wpdata.admin_url, {action: wpdata.action, nonce: wpdata.nonce, id: wpdata.id, method: 'exit'}, function(e){ - // Deal with the response from the 'exit' handler. + window.location = wpdata.exit; }); }); }