Mercurial > defr > drupal > scald > dnd

changeset 27:9a92410be362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed json decoding, which I will now proceed to throw out.
author David Eads <eads@chicagotech.org>
date Fri, 13 Mar 2009 19:34:05 -0500
parents 45c6c48c2a88
children 7d6bf2dca269
files dnd.module js/dnd-library.js
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/dnd.module	Wed Mar 11 22:52:20 2009 -0500
+++ b/dnd.module	Fri Mar 13 19:34:05 2009 -0500
@@ -137,7 +137,7 @@
   $request = drupal_http_request($settings['url']);
 
   // We must remove some Drupal escaping
-  $json = json_decode(str_replace(array('\x3c', '\x3e', '\x26'), array("<", ">", "&"), $request->data), TRUE);
+  $json = json_decode(str_replace(array('\x3c', '\x3e', '\x26', "\'"), array("<", ">", "&", "'"), $request->data), TRUE);
 
   // Generate an array of editor representations to add
   if (is_array($json['editor_representations'])) {
--- a/js/dnd-library.js	Wed Mar 11 22:52:20 2009 -0500
+++ b/js/dnd-library.js	Fri Mar 13 19:34:05 2009 -0500
@@ -205,7 +205,7 @@
       var target = this, $target = $(target), $drop = $(drop), block;
 
       // Update element count
-      Drupal.behaviors.dndLibrary.countElements.call(target, representation_id);
+      //Drupal.behaviors.dndLibrary.countElements.call(target, representation_id);
 
       // Search through block level parents
       $drop.parents().each(function() {