noodall-ui 0.5.14 → 0.5.15

data/app/assets/javascripts/admin/application.js

@@ -540,21 +540,15 @@ $('ol.tree a.parent').live('click', function(e) {
 $('span.link-node').live('click', function(event) {
   Component.link_input = $(this).siblings('input').first();
   // open asset lightbox
-  $.get("/admin/nodes/tree", function() {
-    // reopen the opening form if you close this form
-    $.fancybox({
-      href: '#tree-browser',
-      title: "Link to content"
-    });
-    $('#tree-browser').attr('class', 'link');
-  },
-  'script');
-
+  $.fancybox({
+    href: '/admin/nodes/tree?mode=link&scope_with=component',
+    title: "Link to content"
+  });
   event.stopImmediatePropagation();
   return false;
 });
 
-$('#tree-browser.link a').live('click', function(e) {
+$('ol.tree.component a.link').live('click', function(e) {
   $(Component.link_input).val($(this).attr('href'));
   Component.reopen_slot();
   return false;

data/app/assets/javascripts/admin/tiny_mce_config.js

@@ -90,7 +90,7 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
           // open asset lightbox
           // reopen the opening form if you close this form
           $.fancybox({
-            href: "/admin/nodes/tree?mode=link",
+            href: "/admin/nodes/tree?mode=link&scope_with=tiny-mce",
             title: "Link to content"
           });
         }
@@ -108,7 +108,7 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
 
       // wow what a hack: insert a containing span for the page name if nothing is selected,
       // then insert the link, then remove containing span after all is good
-      $('ol.tree a.link').live('click', function(event) {
+      $('ol.tree.tiny-mce a.link').live('click', function(event) {
         add_url = $(this).attr('href').split('?')[0];
         tinyMCE.activeEditor.selection.moveToBookmark(tinyMCE.activeEditor.windowManager.bookmark);
 

data/app/controllers/noodall/admin/nodes_controller.rb

@@ -25,6 +25,7 @@ module Noodall
       end
 
       def tree
+        params[:scope_with] ||= 'tiny-mce'
         if params[:id].nil?
           @nodes = Node.roots
         else

data/app/views/noodall/admin/nodes/_branch.html.erb

@@ -1,4 +1,4 @@
-<ol class="tree">
+<ol class="tree <%= params[:scope_with] %>">
 <% if @parent.nil? %>
   <% if params[:mode] == 'parent' %>
   <li><a id="id-none" class="<%= params[:mode] %>" href="/">Root</a></li>

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.5.14"
+    VERSION = "0.5.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noodall-ui
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: noodall-core
@@ -722,7 +722,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3396913091192908078
+      hash: -4118798417411438277
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -731,7 +731,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Noodall Rails User Interface