Changeset 2164

Timestamp:

09/09/10 12:11:21 (17 months ago)

Author:

tboutell

Message:

John and I found and fixed the following bug:

* If you save a singleton slot that has never been saved before, and variants exist, the Options menu does not appear until you refresh the page

There is special-case code to update the Options menu when a slot gets saved, however that code did not account for the fact that singleton slot controls are hauled up one level to their area wrapper.

Location:

plugins/apostrophePlugin/trunk

Files:

• lib/toolkit/BaseaTools.class.php (modified) (1 diff)
• modules/a/templates/_area.php (modified) (1 diff)
• modules/a/templates/_slot.php (modified) (1 diff)

plugins/apostrophePlugin/trunk/lib/toolkit/BaseaTools.class.php

@@ -574 +574 @@
     // 2. If app_a_allowed_variants is set and a specific list of allowed variants
     // is provided for this slot type, those variants are allowed.
-    // 3. If app_a_allowed_variatns is set and a specific list is not present for this slot type,
+    // 3. If app_a_allowed_variants is set and a specific list is not present for this slot type,
     // no variants are allowed for this slot type.
     // 4. An allowed_variants option in an a_slot or a_area call overrides all of the above.

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

@@ -159 +159 @@
                         <?php if (!$infinite): ?>
                                 <?php // Singleton Slot Controls ?>
-                                if ($('#a-area-<?php echo "$pageid-$name" ?>.singleton .a-slot-controls-moved').length) {       <?php // This is far from optimal. We are still using jQuery to "toss up" the slot controls if it's a Singleton slot. ?>
-                                        $('#a-area-<?php echo "$pageid-$name" ?>.singleton .a-slot-controls').remove(); <?php // If the slot controls have already been pushed up, remove any new instances from an Ajax return ?>
-                                }
-                                else
-                                {
+                                $('#a-area-<?php echo "$pageid-$name" ?>.singleton .a-slot-controls-moved').remove();
                                         $('#a-area-<?php echo "$pageid-$name" ?>.singleton .a-slot-controls').prependTo($('#a-area-<?php echo "$pageid-$name" ?>')).addClass('a-area-controls a-slot-controls-moved').removeClass('a-slot-controls');   <?php // Move up the slot controls and give them some class names. ?>
-                                        $('ul.a-slot-controls-moved a.a-btn.a-history-btn').removeClass('big'); // Singleton Slots can't have big history buttons, Sorry Charlie!
-                                };                              
+                                        $('ul.a-slot-controls-moved a.a-btn.a-history-btn').removeClass('big'); <?php // Singleton Slots can't have big history buttons, Sorry Charlie! ?>
                         <?php endif ?>
 

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

@@ -134 +134 @@
           <?php // It's OK to show the variants menu once we've saved something ?>
           <?php if (!$slot->isNew()): ?>
-            outerWrapper.find('.a-controls li.variant').show();
+            var singletonArea = outerWrapper.closest('.singleton');
+            if (singletonArea.length)
+            {
+              singletonArea.find('.a-controls li.variant').show();
+            }
+            else
+            {
+              outerWrapper.find('.a-controls li.variant').show();
+            }
           <?php endif ?>
         <?php endforeach ?>