Changeset 2167

Timestamp:

09/09/10 14:44:56 (17 months ago)

Author:

johnnyoffline

Message:

1. Fixed a bug with the apostrophe.menuToggle calls in _area.php
2. Enhanced apostrophe.menuToggle to fail gracefully if the toggle button is undefined
3. Fixed the cancel button for menu toggles so that they work even in the form was added later with ajax.

Location:

plugins/apostrophePlugin/trunk

Files:

• modules/a/templates/_area.php (modified) (2 diffs)
• modules/a/templates/_createPage.php (modified) (1 diff)
• modules/a/templates/_globalTools.php (modified) (1 diff)
• modules/a/templates/_simpleEditWithVariants.php (modified) (1 diff)
• modules/a/templates/_slot.php (modified) (1 diff)
• modules/a/templates/_variant.php (modified) (2 diffs)
• web/js/a.js (modified) (5 diffs)

plugins/apostrophePlugin/trunk/modules/a/templates/_area.php

@@ -11 +11 @@
   $slots = isset($slots) ? $sf_data->getRaw('slots') : null;
 ?>
-<?php use_helper('a', 'jQuery', 'I18N') ?>
+
+<?php use_helper('a') ?>
 
 <?php slot('a-history-controls') ?>
@@ -172 +173 @@
         });
 </script>
-<?php a_js_call('apostrophe.areaUpdateMoveButtons(?, ?, ?)', url_for('a/moveSlot'), $pageid, $name) ?>
-<?php a_js_call('apostrophe.menuToggle(?)', array('button' => '#a-add-slot-'.$pageid.'-'.$name, 'classname' => 'a-options-open', 'overlay' => false)) ?>
+
+<?php if ($infinite): ?>
+        <?php a_js_call('apostrophe.areaUpdateMoveButtons(?, ?, ?)', url_for('a/moveSlot'), $pageid, $name) ?>
+        <?php a_js_call('apostrophe.menuToggle(?)', array('button' => '#a-add-slot-'.$pageid.'-'.$name, 'classname' => 'a-options-open', 'overlay' => false)) ?>        
 <?php endif ?>
+
+<?php endif ?>

plugins/apostrophePlugin/trunk/modules/a/templates/_createPage.php

@@ -3 +3 @@
   $form = isset($form) ? $sf_data->getRaw('form') : null;
 ?>
-<?php use_helper('I18N') ?>
 
-<a href="#" class="a-btn icon a-add a-create-page" id="a-create-page-button" onclick="return false;"><span class="icon"></span><?php echo __("Add Page", null, 'apostrophe') ?></a>
+<?php use_helper('a') ?>
+
+<a href="#add-page" class="a-btn icon a-add a-create-page" id="a-create-page-button" onclick="return false;"><span class="icon"></span><?php echo __("Add Page", null, 'apostrophe') ?></a>
 
 <form method="POST" action="<?php echo url_for('a/create') ?>" id="a-create-page-form" class="a-ui a-options a-page-form a-create-page-form dropshadow">

plugins/apostrophePlugin/trunk/modules/a/templates/_globalTools.php

@@ -1 @@
-<?php use_helper('I18N') ?>
+<?php use_helper('a') ?>
 
 <?php $buttons = aTools::getGlobalButtons() ?>

plugins/apostrophePlugin/trunk/modules/a/templates/_simpleEditWithVariants.php

@@ -16 +16 @@
 
 <?php include_partial('a/simpleEditButton', array('pageid' => $pageid, 'slot' => $slot, 'name' => $name, 'permid' => $permid, 'controlsSlot' => false)) ?>
-
 <?php include_partial('a/variant', array('pageid' => $pageid, 'name' => $name, 'permid' => $permid, 'slot' => $slot)) ?>
 

plugins/apostrophePlugin/trunk/modules/a/templates/_slot.php

@@ -17 +17 @@
   $validationData = isset($validationData) ? $sf_data->getRaw('validationData') : null;
 ?>
-<?php use_helper('jQuery', 'I18N') ?>
+<?php use_helper('a') ?>
 
 <?php // We now render the edit view only when it is AJAXed into place on demand. This saves us the ?>

plugins/apostrophePlugin/trunk/modules/a/templates/_variant.php

@@ -6 +6 @@
   $slot = isset($slot) ? $sf_data->getRaw('slot') : null;
 ?>
-<?php use_helper('I18N') ?>
+
+<?php use_helper('a') ?>
+
 <?php $options = $sf_user->getAttribute("slot-options-$pageid-$name-$permid", null, 'apostrophe') ?>
 <?php $variants = aTools::getVariantsForSlotType($slot->type, $options) ?>
@@ -48 +50 @@
     </ul>
   </li>
+
+        <?php if (!$slot->isNew()): ?>
+                <?php a_js_call('apostrophe.menuToggle(?)', array('button' => '#a-'.$pageid.'-'.$name.'-'.$permid.'-variant-options-toggle', 'classname' => 'a-options-open', 'overlay' => false)) ?>   
+        <?php endif ?>
+
 <?php endif ?>
-
-<?php a_js_call('apostrophe.menuToggle(?)', array('button' => '#a-'.$pageid.'-'.$name.'-'.$permid.'-variant-options-toggle', 'classname' => 'a-options-open', 'overlay' => false)) ?>

plugins/apostrophePlugin/trunk/web/js/a.js

@@ -469 +469 @@
                 var aPageSettingsButton = $('#a-page-settings-button');         
 
-                _menuToggle('#a-page-settings-button', '', true);
-
+                apostrophe.menuToggle({"button":"#a-page-settings-button","classname":"","overlay":true})
+                
                 aPageSettingsButton.click(function() {
                  $.ajax({
@@ -638 +638 @@
                 var classname = options['classname'];
                 var overlay = options['overlay'];
-                _menuToggle(button, classname, overlay);
-        }
-
-
-        function _menuToggle(button, classname, overlay)
+
+                if (typeof(button) == "undefined") {
+                        apostrophe.log('[Apostrophe] menuToggle button is undefined');
+                }
+                else
+                {
+                        if (typeof button == "string") { button = $(button); } /* button that toggles the menu open & closed */
+                        if (typeof classname == "undefined" || classname == '') { classname = "show-options";   } /* optional classname override to use for toggle & styling */
+                        if (typeof overlay != "undefined" && overlay) { overlay = $('.a-page-overlay'); } /* optional full overlay */ 
+
+                        // Use the parent of the button as the menu container           
+                        var menu = $(button).parent(); 
+                        if (typeof(menu) == "object") {
+                                _menuToggle(button, menu, classname, overlay);                  
+                        };      
+                };
+        }
+
+        function _menuToggle(button, menu, classname, overlay)
         {       
-                /* Usage: aMenuToggle(Object|ID Selector, Object|ID Selector, Undefined|String, Undefined|True|False) */
-
-                if (typeof button == "string") { button = $(button); } /* button that toggles the menu open & closed */
-                if (typeof classname == "undefined" || classname == '') { classname = "show-options";   } /* optional classname override to use for toggle & styling */
-                if (typeof overlay != "undefined" && overlay) { overlay = $('.a-page-overlay'); } /* optional full overlay */ 
-                var menu = $(button).parent(); // Use the parent of the button as the menu container
-
-                // We need an ID for the menu. If the menu doesn't have one, we create it by appending 'menu' to the Button ID          
-                if (menu.attr('id') == '') {
+                // Menu must have an ID. 
+                // If the menu doesn't have one, we create it by appending 'menu' to the Button ID              
+                if (menu.attr('id') == '') 
+                {
                         newID = button.attr('id')+'-menu';
                         menu.attr('id', newID).addClass('a-options-container');
@@ -667 +676 @@
                                 menu.trigger('toggleClosed');
                         }
-                });
+                }).addClass('a-options-button');
 
                 // Open Menu, Create Listener
@@ -674 +683 @@
                         menu.addClass(classname);                       
                         if (overlay) { overlay.stop().show(); }
-                        $(document).click(function(e){
-                                var target = $(e.target);
+                        $(document).click(function(event){
+                                var target = $(event.target);
                                 if (target.hasClass('.a-page-overlay') || target.hasClass('.a-cancel')) 
                                 {
@@ -691 +700 @@
                         button.removeClass('aActiveMenu');
                         menu.removeClass(classname);
-                        if (overlay) { overlay.fadeOut(); }
+                        if (overlay) { overlay.fadeOut(); };
                         $(document).unbind('click'); // Clear out click event           
                 });
 
-                $('.a-options-cancel').live('click', function(){
-                        // console.log(menu);
-                        $(this).closest(menu).trigger('toggleClosed');
+                menu.click(function(event){
+                        target = $(event.target);
+                        if (target.hasClass('a-options-cancel')) 
+                        {
+                                menu.trigger('toggleClosed');
+                        };                      
                 });