noodall-ui 0.5.14 → 0.5.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -540,21 +540,15 @@ $('ol.tree a.parent').live('click', function(e) {
540
540
  $('span.link-node').live('click', function(event) {
541
541
  Component.link_input = $(this).siblings('input').first();
542
542
  // open asset lightbox
543
- $.get("/admin/nodes/tree", function() {
544
- // reopen the opening form if you close this form
545
- $.fancybox({
546
- href: '#tree-browser',
547
- title: "Link to content"
548
- });
549
- $('#tree-browser').attr('class', 'link');
550
- },
551
- 'script');
552
-
543
+ $.fancybox({
544
+ href: '/admin/nodes/tree?mode=link&scope_with=component',
545
+ title: "Link to content"
546
+ });
553
547
  event.stopImmediatePropagation();
554
548
  return false;
555
549
  });
556
550
 
557
- $('#tree-browser.link a').live('click', function(e) {
551
+ $('ol.tree.component a.link').live('click', function(e) {
558
552
  $(Component.link_input).val($(this).attr('href'));
559
553
  Component.reopen_slot();
560
554
  return false;
@@ -90,7 +90,7 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
90
90
  // open asset lightbox
91
91
  // reopen the opening form if you close this form
92
92
  $.fancybox({
93
- href: "/admin/nodes/tree?mode=link",
93
+ href: "/admin/nodes/tree?mode=link&scope_with=tiny-mce",
94
94
  title: "Link to content"
95
95
  });
96
96
  }
@@ -108,7 +108,7 @@ $.extend(tiny_mce_config, lite_tiny_mce_config, {
108
108
 
109
109
  // wow what a hack: insert a containing span for the page name if nothing is selected,
110
110
  // then insert the link, then remove containing span after all is good
111
- $('ol.tree a.link').live('click', function(event) {
111
+ $('ol.tree.tiny-mce a.link').live('click', function(event) {
112
112
  add_url = $(this).attr('href').split('?')[0];
113
113
  tinyMCE.activeEditor.selection.moveToBookmark(tinyMCE.activeEditor.windowManager.bookmark);
114
114
 
@@ -25,6 +25,7 @@ module Noodall
25
25
  end
26
26
 
27
27
  def tree
28
+ params[:scope_with] ||= 'tiny-mce'
28
29
  if params[:id].nil?
29
30
  @nodes = Node.roots
30
31
  else
@@ -1,4 +1,4 @@
1
- <ol class="tree">
1
+ <ol class="tree <%= params[:scope_with] %>">
2
2
  <% if @parent.nil? %>
3
3
  <% if params[:mode] == 'parent' %>
4
4
  <li><a id="id-none" class="<%= params[:mode] %>" href="/">Root</a></li>
@@ -1,5 +1,5 @@
1
1
  module Noodall
2
2
  module UI
3
- VERSION = "0.5.14"
3
+ VERSION = "0.5.15"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: noodall-ui
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.14
4
+ version: 0.5.15
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-10-10 00:00:00.000000000 Z
12
+ date: 2013-02-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: noodall-core
@@ -722,7 +722,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
722
722
  version: '0'
723
723
  segments:
724
724
  - 0
725
- hash: -3396913091192908078
725
+ hash: -4118798417411438277
726
726
  required_rubygems_version: !ruby/object:Gem::Requirement
727
727
  none: false
728
728
  requirements:
@@ -731,7 +731,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
731
731
  version: 1.3.6
732
732
  requirements: []
733
733
  rubyforge_project:
734
- rubygems_version: 1.8.24
734
+ rubygems_version: 1.8.23
735
735
  signing_key:
736
736
  specification_version: 3
737
737
  summary: Noodall Rails User Interface