# HG changeset patch # User David Eads # Date 1236990845 18000 # Node ID 9a92410be362c14623f4ed9eb517a1502e7eb260 # Parent 45c6c48c2a88d4efd694f6b7542b2b8670264875 Fixed json decoding, which I will now proceed to throw out. diff -r 45c6c48c2a88 -r 9a92410be362 dnd.module --- 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'])) { diff -r 45c6c48c2a88 -r 9a92410be362 js/dnd-library.js --- 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() {