@@ -14,9 +14,12 @@ class PageController < ApplicationController end def control - render :text => 'This content is the response from an AJAX call.' if params.has_key? :ajax end + def ajax_example + render :text => 'This content is the response from an AJAX call.' + end + def extras end app/controllers/page_controller.rb @@ -113,7 +113,7 @@ <% examples.item :name => '<a href="#centered">Centered Window / Content on Page</a>', :options => "className: 'simple_window', closeOnClick: true" %> <% examples.item :name => '<a href="#relative">Relative Window / Dynamic Content</a>', :options => "position: 'relative', className: 'simple_window', closeOnClick: true" %> <% examples.item :name => '<a href="#hoverbox">HoverBox</a>', :options => "position: 'relative', offsetLeft: 75, width: 175, hover: true, className: 'tooltip'" %> - <% examples.item :name => '<a href="?ajax">Relative Window / Content from Ajax</a>', :options => "offsetLeft: 150, position: 'relative', className: 'simple_window', closeOnClick: 'container'" %> + <% examples.item :name => '<a href="/ajax_example">Relative Window / Content from Ajax</a>', :options => "offsetLeft: 150, position: 'relative', className: 'simple_window', closeOnClick: 'container'" %> <% examples.item :name => '<a href="/stylesheets/sample_images/tabs_example_1_big.jpg" id="styled_window_one" title="Piha Beach, New Zealand">Draggable / Styled Window One</a>', :options => "window_factory() options" %> <% examples.item :name => '<a href="/stylesheets/sample_images/tabs_example_2_big.jpg" id="styled_window_two" title="Pioneer Mountains, Idaho">Draggable / Styled Window Two</a>', :options => "window_factory() options" %> <% examples.item :name => '<a href="/stylesheets/sample_images/tabs_example_3_big.jpg" id="modal">Modal Window</a>', :options => "fade: true, overlayOpacity: 0.75, className: 'modal'" %> @@ -221,7 +221,7 @@ }); //Relative Window / Content from Ajax - var ajax = new Control.Window($(document.body).down('[href=?ajax]'),{ + var ajax = new Control.Window($(document.body).down('[href=/ajax_example]'),{ className: 'simple_window', closeOnClick: 'container', offsetLeft: 150 app/views/page/_examples.rhtml @@ -100,7 +100,7 @@ }); //Relative Window / Content from Ajax - var ajax = new Control.Window($(document.body).down('[href=?ajax]'),{ + var ajax = new Control.Window($(document.body).down('[href=/ajax_example]'),{ className: 'simple_window', closeOnClick: 'container', offsetLeft: 150 @@ -186,7 +186,7 @@ <% examples.item :name => '<a href="#centered">Centered Window / Content on Page</a>', :options => "className: 'simple_window', closeOnClick: true" %> <% examples.item :name => '<a href="#relative">Relative Window / Dynamic Content</a>', :options => "position: 'relative', className: 'simple_window', closeOnClick: true" %> <% examples.item :name => '<a href="#hoverbox">HoverBox</a>', :options => "position: 'relative', offsetLeft: 75, width: 175, hover: true, className: 'tooltip'" %> - <% examples.item :name => '<a href="?ajax">Relative Window / Content from Ajax</a>', :options => "offsetLeft: 150, position: 'relative', className: 'simple_window', closeOnClick: 'container'" %> + <% examples.item :name => '<a href="/ajax_example">Relative Window / Content from Ajax</a>', :options => "offsetLeft: 150, position: 'relative', className: 'simple_window', closeOnClick: 'container'" %> <% examples.item :name => '<a href="/stylesheets/sample_images/tabs_example_1_big.jpg" id="styled_window_one" title="Piha Beach, New Zealand">Draggable / Styled Window One</a>', :options => "window_factory() options" %> <% examples.item :name => '<a href="/stylesheets/sample_images/tabs_example_2_big.jpg" id="styled_window_two" title="Pioneer Mountains, Idaho">Draggable / Styled Window Two</a>', :options => "window_factory() options" %> <% examples.item :name => '<a href="/stylesheets/sample_images/tabs_example_3_big.jpg" id="modal">Modal Window</a>', :options => "fade: true, overlayOpacity: 0.75, className: 'modal'" %> @@ -292,4 +292,4 @@ <% options_table 'Control.LightBox Options' do |options| %> <% options.item :type => 'bool', :name => 'modal', :default => "false", :description => 'Will act as a Control.Modal instead of a Control.Window if true.' %> <% end %> -<% end %> \ No newline at end of file +<% end %> app/views/page/control/_window.rhtml @@ -23,5 +23,6 @@ ACTIONS = { 'download' => '/download', 'core' => '/core', 'extras' => '/extra', - 'controls' => '/control' + 'controls' => '/control', + 'ajax_example' => '/ajax_example' } config/action_map.rb a6bd366c5b3f8468bdce88130d48f5da464397bc Nathan Lloyd Smith nlloyds@gmail.com http://github.com/syntacticx/livepipe.net-documentation/commit/ef3fd59a7e851da39584fdc533d7ee6f37b8b8bc ef3fd59a7e851da39584fdc533d7ee6f37b8b8bc 2009-06-10T20:54:00-07:00 2009-06-10T20:54:00-07:00 Fix for Control.Window Ajax example dceb1561fa1462f12d602f12381292677539f2ed Nathan Lloyd Smith nlloyds@gmail.com