From adb966a734f88c52cd888e4e7c4cc15365bc3511 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 5 Dec 2012 13:21:18 -0500 Subject: [PATCH] CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page -cancel button does not reload the page anymore --- airtime_mvc/application/forms/EditAudioMD.php | 5 ++--- airtime_mvc/public/js/airtime/library/library.js | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php index 8153cb23c..11dda2610 100644 --- a/airtime_mvc/application/forms/EditAudioMD.php +++ b/airtime_mvc/application/forms/EditAudioMD.php @@ -138,17 +138,16 @@ class Application_Form_EditAudioMD extends Zend_Form )); // Add the submit button - $this->addElement('button', 'cancel', array( + $this->addElement('button', 'editmdcancel', array( 'ignore' => true, 'class' => 'btn md-cancel', 'label' => _('Cancel'), - 'onclick' => 'javascript:document.location.href="'.$baseUrl.'/Library"', 'decorators' => array( 'ViewHelper' ) )); - $this->addDisplayGroup(array('editmdsave', 'cancel'), 'submitButtons', array( + $this->addDisplayGroup(array('editmdsave', 'editmdcancel'), 'submitButtons', array( 'decorators' => array( 'FormElements', 'DtDdWrapper' diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 55689c43f..600b3dcc1 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -1273,4 +1273,8 @@ $(document).ready(function() { $("#edit-md-dialog").dialog().remove(); }); }); + + $('#editmdcancel').live("click", function() { + $("#edit-md-dialog").dialog().remove(); + }); });