Development

Changeset 27192

You must first sign up to be able to contribute.

Changeset 27192

Show
Ignore:
Timestamp:
01/26/10 14:51:01 (3 years ago)
Author:
ornicar2
Message:

[Diem]
- edition javascripts now use the new jQuery.parseJSON method

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/diemPlugin/trunk/dmCorePlugin/web/js/dmCoreEditPlugins.js

    r27114 r27192  
    6464      if($encodedAssetsDiv = this.find('div.dm_encoded_assets').orNot()) 
    6565      { 
    66         json = $encodedAssetsDiv.html(); 
     66        data = jQuery.parseJSON($encodedAssetsDiv.html()); 
     67 
    6768        $encodedAssetsDiv.remove(); 
    68  
    69         // Try to use the native JSON parser first 
    70         if ( window.JSON && window.JSON.parse ) 
    71         { 
    72           data = window.JSON.parse( json ); 
    73         } 
    74         else 
    75         { 
    76           data = (new Function("return " + json))(); 
    77         } 
    7869 
    7970        for (i in data.css) 

  • plugins/diemPlugin/trunk/dmFrontPlugin/web/js/dmFrontPageAddForm.js

    r27036 r27192  
    2323      self.$slug = $('input#dm_page_front_new_form_slug', self.element).attr('disabled', self.autoSlug); 
    2424 
    25       var json = $('div.parent_slugs', self.element).text(); 
    26        
    27       // Try to use the native JSON parser first 
    28       if ( window.JSON && window.JSON.parse ) 
    29       { 
    30         self.parentSlugs = window.JSON.parse( json ); 
    31       } 
    32       else 
    33       { 
    34         self.parentSlugs = (new Function("return " + json))(); 
    35       } 
     25      self.parentSlugs = $.parseJSON($('div.parent_slugs', self.element).text()); 
    3626       
    3727      self.$form = $('form', self.element).dmAjaxForm({