test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994 in rich-1.2.0 vs test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994 in rich-1.3.0

- old
+ new

@@ -1,8 +1,8 @@ -o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1340614562.402483: @value"ÅÞ {I" +o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1350765777.077098: @value"àß {I" class:EFI"BundledAsset;FI"logical_path;FI"application.js;TI" pathname;FI"0$root/app/assets/javascripts/application.js;FI"content_type;FI"application/javascript;FI" -mtime;FI"2012-05-22T16:19:38+02:00;FI" length;FiÝ I" digest;F"%a94a54fc77e075e9ec68586608ea9f23I" source;FI"Ý /*! +mtime;FI"2012-10-20T22:42:53+02:00;FI" length;Fi/Þ I" digest;F"%420ee5d8c80bbf1686e30011fa634113I" source;FI"/Þ /*! * jQuery JavaScript Library v1.7.2 * http://jquery.com/ * * Copyright 2011, John Resig * Dual licensed under the MIT or GPL Version 2 licenses. @@ -9952,10 +9952,11 @@ } return url + ( ( url.indexOf( "?" ) != -1 ) ? "&" : "?" ) + queryString.join( "&" ); } // load external plugins +CKEDITOR.plugins.addExternal('audio', '/assets/ckeditor-contrib/plugins/audio/'); CKEDITOR.plugins.addExternal('MediaEmbed', '/assets/ckeditor-contrib/plugins/MediaEmbed/'); CKEDITOR.plugins.addExternal('richfile', '/assets/ckeditor-contrib/plugins/richfile/'); CKEDITOR.config.skin = 'BootstrapCK-Skin,/assets/ckeditor-contrib/skins/BootstrapCK/'; // Direct asset picker @@ -9983,13 +9984,21 @@ params.dom_id = dom_id; var url = addQueryString(options.richBrowserUrl, params ); window.open(url, 'filebrowser', "width=860,height=500") }, - setAsset: function(dom_id, asset){ - $(dom_id).val(asset); - $(dom_id).siblings('img.rich-image-preview').first().attr({src: asset}); + setAsset: function(dom_id, asset, id, type){ + var split_field_name = $(dom_id).attr('id').split('_') + if (split_field_name[split_field_name.length - 1] == "id") { + $(dom_id).val(id); + } else { + $(dom_id).val(asset); + } + + if(type=='image') { + $(dom_id).siblings('img.rich-image-preview').first().attr({src: asset}); + } } }; // Rich Asset input @@ -10009,6 +10018,6 @@ // ; -;TI"required_assets_digest;F"%e407bd67b4d91e488ecc7b4af3fc10c1I" _version;F"%9f3b95dd7ea3030dc35985c0a8020862 +;TI"required_assets_digest;F"%b6b53bdab7e392ee25079d1ca4f60ef7I" _version;F"%9f3b95dd7ea3030dc35985c0a8020862 \ No newline at end of file