From cb72db4a31ef42fe017bf8d1a1fd2892dc08151b Mon Sep 17 00:00:00 2001 From: james Date: Mon, 4 Jul 2011 13:11:35 -0400 Subject: [PATCH] CC-2460:Popup shouldn't show after X is pressed - changed function name to "donotshowpopup" --- .../application/controllers/PreferenceController.php | 2 +- airtime_mvc/public/js/airtime/nowplaying/register.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 575b6313a..72769bc7d 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -114,7 +114,7 @@ class PreferenceController extends Zend_Controller_Action die(); } - public function deletesessionvarAction() + public function donotshowpopupAction() { // unset session Zend_Session::namespaceUnset('referrer'); diff --git a/airtime_mvc/public/js/airtime/nowplaying/register.js b/airtime_mvc/public/js/airtime/nowplaying/register.js index eb6896b09..cbbb95d0e 100644 --- a/airtime_mvc/public/js/airtime/nowplaying/register.js +++ b/airtime_mvc/public/js/airtime/nowplaying/register.js @@ -1,8 +1,8 @@ $(document).ready(function(){ var dialogGlob; - function deleteSessionVar(){ - $.get("/Preference/deletesessionvar"); + function doNotShowPopup(){ + $.get("/Preference/donotshowpopup"); } $.get("/Preference/register", {format:"json"}, function(json){ @@ -15,7 +15,7 @@ $(document).ready(function(){ resizable: false, modal: true, position:['center',50], - close: deleteSessionVar, + close: doNotShowPopup, buttons: [ { id: "remind_me",