cleaning up js a bit
Oleg
committed Dec 13, 2011
commit 22a653069725ea67f753c632da023e6ab2005326
Showing 2
changed files with
25 additions
and 19 deletions
app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.sofa_image.js
+23
-17
| @@ | @@ -3,10 +3,24 @@ |
| elRTE.prototype.ui.prototype.buttons.sofa_image = function(rte, name) { | |
| this.constructor.prototype.constructor.call(this, rte, name); | |
| + | var self = this; |
| + | self.rte = rte; |
| + | self.img = null; |
| + | self.dialog = null; |
| + | |
| + | this.set = function(){ |
| + | var src = self.img.data('url'); |
| + | self.rte.history.add(); |
| + | var img = $(self.rte.doc.createElement('img')); |
| + | img.attr('src', src); |
| + | self.rte.selection.insertNode(img[0]); |
| + | self.rte.ui.update(); |
| + | self.dialog.dialog('close'); |
| + | } |
| + | |
| this.command = function(){ | |
| - | |
| - | var cms_dialog = jQuery(jQuery('#cms_dialog').get(0) || jQuery('<div id="cms_dialog"></div>')); |
| - | cms_dialog.dialog({ |
| + | self.dialog = jQuery(jQuery('#cms_dialog').get(0) || jQuery('<div id="cms_dialog"></div>')); |
| + | self.dialog.dialog({ |
| title : rte.i18n('Image'), | |
| modal : true, | |
| resizable : false, | |
| @@ | @@ -18,21 +32,13 @@ |
| jQuery.ajax({ | |
| url: '/' + $('meta[name="cms-admin-path"]').attr('content') + '/sites/' + $('meta[name="cms-site-id"]').attr('content') + '/dialog/image', | |
| success: function(data){ | |
| - | cms_dialog.html(data); |
| - | cms_dialog.dialog('open'); |
| + | self.dialog.html(data); |
| + | self.dialog.dialog('open'); |
| $.CMS.enable_uploader(); | |
| - | var opts = { |
| - | rte : rte, |
| - | dialog: cms_dialog |
| - | } |
| - | $('#cms_dialog .uploaded_files img').click(opts, function(){ |
| - | var src = $(this).attr('src'); |
| - | opts.rte.history.add(); |
| - | var img = $(opts.rte.doc.createElement('img')); |
| - | img.attr('src', src); |
| - | opts.rte.selection.insertNode(img[0]); |
| - | opts.rte.ui.update(); |
| - | opts.dialog.dialog('close'); |
| + | |
| + | $('#cms_dialog .uploaded_files img').click(function(){ |
| + | self.img = $(this); |
| + | self.set(this); |
| }); | |
| } | |
| }) | |
app/views/cms_admin/files/_file.html.erb
+2
-2
| @@ | @@ -4,8 +4,8 @@ |
| <% if file.is_image? %> | |
| <div class='thumb_container'> | |
| <div class='thumb'> | |
| - | <%= image_tag file.file.url(:cms_thumb) %> |
| - | <input type='text' value='http://<%= @site.hostname %><%= file.file.url %>'/> |
| + | <%= image_tag file.file.url(:cms_thumb), :data => {:url => file.file.url} %> |
| + | <input type='text' value='<%= file.file.url %>'/> |
| </div> | |
| </div> | |
| <% end %> | |