noodall-ui 0.3.4 → 0.3.5

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

data/public/javascripts/admin/tiny_mce_config.js

@@ -45,7 +45,10 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
         image : '/images/admin/image_small.png',
         href: '#asset-browser',
         onclick : function() {
-          Browser.do_action_and_close = function() {
+          tinyMCE.activeEditor.focus();
+          tinyMCE.activeEditor.windowManager.bookmark = tinyMCE.activeEditor.selection.getBookmark();
+          Browser.action = function(e) {
+            e.stopImmediatePropagation();
             asset_id = Browser.assets_to_add[0]
             if (asset_id) {
               add_url = $('#asset-' + asset_id).siblings('a.show').attr('href').split('?')[0] + '/add';
@@ -55,24 +58,23 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
                 choices = $('#asset-browser .choice');
                 if (choices.length > 0) {
                   $.each(choices, function(i, choice){
-                    $(choice).click(function(){
-                      tinyMCE.activeEditor.focus();
+                    $(choice).click(function(e){
+                      tinyMCE.activeEditor.selection.moveToBookmark(tinyMCE.activeEditor.windowManager.bookmark);
                       tinyMCE.activeEditor.selection.setContent($(this).html());
-                      Browser.close();
+                      $.fancybox.close();
                       return false;
-                    })
+                    });
                   });
                 } else {
-                  tinyMCE.activeEditor.focus();
+                  tinyMCE.activeEditor.selection.moveToBookmark(tinyMCE.activeEditor.windowManager.bookmark);
                   tinyMCE.activeEditor.selection.setContent(data);
-                  Browser.close();
+                  $.fancybox.close();
                   return false;
                 }
               }, 'html');
             }
             return false;
           };
-          Browser.after_close = $.fancybox.close;
           Browser.open();
         }
       });
@@ -82,6 +84,8 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
         image : '/images/admin/top-level_small.png',
         href: '#asset-browser',
         onclick : function() {
+          tinyMCE.activeEditor.focus();
+          tinyMCE.activeEditor.windowManager.bookmark = tinyMCE.activeEditor.selection.getBookmark();
           // open asset lightbox
           $.get("/admin/nodes/tree", function() {
             // reopen the opening form if you close this form
@@ -106,6 +110,7 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
       // then insert the link, then remove containing span after all is good
       $('#tree-browser.tinymce li a').live('click', function(event) {
         add_url = $(this).attr('href').split('?')[0];
+        tinyMCE.activeEditor.selection.moveToBookmark(tinyMCE.activeEditor.windowManager.bookmark);
 
         if(tinyMCE.activeEditor.selection.getContent().length === 0){
           tinyMCE.execInstanceCommand(tinyMCE.activeEditor.id, 'mceInsertRawHTML', false, '<span class="tmp_tag">' + $(this).text() + '</span>');

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 +01:00
+date: 2011-04-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency