changeset 2725:f94b80842ada

merged
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 15 Aug 2014 13:50:55 +0200
parents 027184f05e7f (current diff) 7c0cefe454cd (diff)
children 48df5adceec7 cb7664022b31
files MoinMoin/items/__init__.py
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/constants/keys.py	Fri Aug 15 01:37:55 2014 +0530
+++ b/MoinMoin/constants/keys.py	Fri Aug 15 13:50:55 2014 +0200
@@ -62,7 +62,6 @@
     ADDRESS,
     DATAID,
     EXTERNALLINKS,
-    ITEMID,
     ITEMLINKS,
     ITEMTRANSCLUSIONS,
     MTIME,
--- a/MoinMoin/items/__init__.py	Fri Aug 15 01:37:55 2014 +0530
+++ b/MoinMoin/items/__init__.py	Fri Aug 15 13:50:55 2014 +0200
@@ -534,8 +534,7 @@
                       suitable as arguments of the same names to pass to
                       item.modify
             """
-            meta = dict(item.meta)
-            meta.update(self['meta_form'].value.copy())
+            meta = self['meta_form'].value.copy()
             meta.update(item.meta_text_to_dict(self['extra_meta_text'].value))
             data, contenttype_guessed = self['content_form']._dump(item.content)
             comment = self['comment'].value
--- a/MoinMoin/static/js/common.js	Fri Aug 15 01:37:55 2014 +0530
+++ b/MoinMoin/static/js/common.js	Fri Aug 15 13:50:55 2014 +0200
@@ -667,7 +667,11 @@
     $('.moin-sortable').tablesorter();
 
     $('#moin-modify').on('change keyup keydown', 'input, textarea, select', function (e) {
-        $(this).addClass('moin-changed-input');
+        $('#moin-modify').addClass('moin-changed-input');
+    });
+
+    $('#moin-save-text-button').on('click', function() {
+        $('#moin-modify').removeClass('moin-changed-input');
     });
 
     $(window).on('beforeunload', function() {