Changeset 4467

Timestamp:

01/11/12 15:29:55 (4 months ago)

Author:

tboutell

Message:

Blog and event metadata forms track whether they have unsaved changes, so the new apostrophe.onBeforeUnload method in a.js can ask them

Location:

plugins/apostropheBlogPlugin/branches/1.5

Files:

• modules/aBlogAdmin/templates/editSuccess.php (modified) (1 diff)
• modules/aEventAdmin/templates/editSuccess.php (modified) (1 diff)
• web/js/aBlog.js (modified) (3 diffs)

plugins/apostropheBlogPlugin/branches/1.5/modules/aBlogAdmin/templates/editSuccess.php

@@ -15 +15 @@
   <div class="a-ui a-subnav-wrapper a-admin-sidebar">
                 <div class="a-subnav-inner">
-            <div id="a-ui a-admin-blog-post-form">
+            <div class="a-admin-blog-post-form">
               <form method="post" action="<?php echo url_for('a_blog_admin_update', $a_blog_post) ?>" id="a-admin-form" class="a-ui blog">
           <?php include_partial('aBlogAdmin/form', array('form' => $form, 'a_blog_post' => $a_blog_post, 'popularTags' => $popularTags, 'existingTags' => $existingTags)) ?>

plugins/apostropheBlogPlugin/branches/1.5/modules/aEventAdmin/templates/editSuccess.php

@@ -15 +15 @@
   <div class="a-ui a-subnav-wrapper a-admin-sidebar">
                 <div class="a-subnav-inner">
-            <div id="a-ui a-admin-blog-post-form">
+                  <?php // Yes I meant to set both classes, this way the event form can define small variations ?>
+                  <?php // on what goes for the similar blog post form and we can select both when checking ?>
+                  <?php // onbeforeunload with just one selector ?>
+            <div class="a-admin-blog-post-form a-admin-event-form">
               <form method="post" action="<?php echo url_for('a_event_admin_update', $a_event) ?>" id="a-admin-form" class="a-ui blog">
           <?php include_partial('aEventAdmin/form', array('form' => $form, 'a_event' => $a_event, 'popularTags' => $popularTags, 'existingTags' => $existingTags)) ?>

plugins/apostropheBlogPlugin/branches/1.5/web/js/aBlog.js

@@ -73 +73 @@
 function aBlogEnableForm(options)
 {
-        var changed = false;
         var savedState = null;
         var form = $('#a-admin-form');
+        form.data('changed', false);
+  
         apostrophe.formUpdates({ selector: '#a-admin-form', update: 'a-admin-form' });
         // Due to the way our markup is structured this is a better place for the little
@@ -105 +106 @@
                         find('.a-save-blog-main .label').text(options['update-labels'][s]);
                 }
+                if (!init)
+                {
+                form.data('changed', true);
+                }
                 init = false;
         });
         status.change();
 
+  // On various fields, including the progressively enhanced fields whose PE code has been upgraded
+  // to send change events, just monitor change() and set the changed flag so it can be checked
+  // by onbeforeunload
+  
+  form.find('#a_blog_item_location,#a_blog_item_all_day,#a_blog_item_start_date_month,#a_blog_item_start_date_day,#a_blog_item_start_date_year,#a_blog_item_start_time_hour,#a_blog_item_start_time_minute,#a_blog_item_end_date_month,#a_blog_item_end_date_day,#a_blog_item_end_date_year,#a_blog_item_end_time_hour,#a_blog_item_end_time_minute,#a_blog_item_published_at_hour,#a_blog_item_published_at_minute,#a_blog_item_author_id,#a-blog-post-tags-input').change(function() {
+    form.data('changed', true);
+  });
+
+  // Listen to keystrokes in the location field. In Chrome at least, text fields don't get a 
+  // change() event when you type in them and then click a link elsewhere on the page that leaves
+  // the page, so we need something else
+  form.find('#a_blog_item_location').keyup(function() {
+    form.data('changed', true);
+  });
+  
         find('.template.section select').change(function() {
                 alert(options['template-change-warning']);
-                // Let the form submit as a full refresh
+                // Let the form submit as a full refresh. Don't complain of unsaved changes when we're about to save changes
+                $(form).data('changed', false);
                 $(form).unbind('submit.aFormUpdates');
         });
@@ -121 +142 @@
         });
         
-        var p = { 'choose-one': options['editors-choose-label'] };
+        var p = { 'choose-one': options['editors-choose-label'], 'onChange': function() {
+          form.data('changed', true);
+        } };
         aMultipleSelect('#editors-section', p);
-        p = { 'choose-one': options['categories-choose-label'] };
+        p = { 'choose-one': options['categories-choose-label'], 'onChange': function() {
+          form.data('changed', true);
+        } };
         if (options['categories-add'])
         {