Skip to content

Commit

Permalink
Added validation to "Add widget instance" which comes from the widget…
Browse files Browse the repository at this point in the history 
… itself.
  • Loading branch information
philsturgeon committed Mar 4, 2010
1 parent c1397c0 commit 92aed78
Show file tree
Hide file tree
Showing 14 changed files with 239 additions and 129 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Expand Up @@ -2,7 +2,9 @@
.project .project
.settings .settings
application/cache/*_m/* application/cache/*_m/*
application/cache/*_lib/*§ application/cache/*_lib/*
application/cache/dwoo/compiled/*.php
application/cache/simplepie/*.spc
application/assets/img/photos/*/* application/assets/img/photos/*/*
application/uploads/assets/* application/uploads/assets/*
codeigniter/logs/log-*.php codeigniter/logs/log-*.php
43 changes: 38 additions & 5 deletions application/modules/core/widgets/controllers/ajax.php
View file
Expand Up @@ -16,7 +16,7 @@ function add_widget_area()


$this->widgets->add_area($data->widget_area); $this->widgets->add_area($data->widget_area);


$this->load->view('admin/ajax/new_area', $data); $this->load->view('admin/ajax/add_area', $data);
} }


function delete_widget_area() function delete_widget_area()
Expand All @@ -25,7 +25,7 @@ function delete_widget_area()
$this->widgets->delete_area($slug); $this->widgets->delete_area($slug);
} }


function show_widget_instance_form() function add_widget_instance_form()
{ {
if(!$this->input->post('widget_slug') || !$this->input->post('area_slug')) if(!$this->input->post('widget_slug') || !$this->input->post('area_slug'))
{ {
Expand All @@ -35,9 +35,9 @@ function show_widget_instance_form()
$widget = $this->widgets->get_widget($this->input->post('widget_slug')); $widget = $this->widgets->get_widget($this->input->post('widget_slug'));
$widget_area = $this->widgets->get_area($this->input->post('area_slug')); $widget_area = $this->widgets->get_area($this->input->post('area_slug'));


$this->load->view('admin/ajax/new_instance', array( $this->load->view('admin/ajax/instance_form', array(
'widget' => $widget, 'widget' => $widget,
'widget_area' => $widget_area, 'widget_area' => $widget_area
)); ));
} }


Expand All @@ -50,7 +50,40 @@ function add_widget_instance()
$options = $_POST; $options = $_POST;
unset($options['title'], $options['widget_id'], $options['widget_area_id']); unset($options['title'], $options['widget_id'], $options['widget_area_id']);


$this->widgets->add_instance($title, $widget_id, $widget_area_id, $options); $result = $this->widgets->add_instance($title, $widget_id, $widget_area_id, $options);

if($result['status'] == 'success')
{
echo json_encode($result);
}

else
{
$data = array(
'widget' => $this->widgets->get_widget($widget_id),
'widget_area' => $this->widgets->get_area($widget_area_id),
'error' => $result['error']
);

echo json_encode(array('status' => 'error', 'form' => $this->load->view('admin/ajax/instance_form', $data, TRUE)));
}
}

function edit_widget_instance_form()
{
$instance_id = $this->input->post('instance_id');
if(!$instance_id)
{
exit();
}

$widget = $this->widgets->get_instance($instance_id);
$widget_area = $this->widgets->get_area($widget->widget_area_slug);

$this->load->view('admin/ajax/instance_form', array(
'widget' => $widget,
'widget_area' => $widget_area,
));
} }


function list_widgets($slug) function list_widgets($slug)
Expand Down
2 changes: 1 addition & 1 deletion application/modules/core/widgets/css/widgets.css
View file
Expand Up @@ -17,4 +17,4 @@


.widget-area .box-container .button { .widget-area .box-container .button {
margin-top:-3.4em; margin-top:-3.4em;
} }
98 changes: 82 additions & 16 deletions application/modules/core/widgets/js/widgets.js
View file
Expand Up @@ -2,13 +2,16 @@
{ {
var add_area; var add_area;
var add_instance; var add_instance;
var edit_instance;


/*
window.onscroll = function() window.onscroll = function()
{ {
// Thanks to Johan Sundström (http://ecmanaut.blogspot.com/) and David Lantner (http://lantner.net/david) // Thanks to Johan Sundström (http://ecmanaut.blogspot.com/) and David Lantner (http://lantner.net/david)
// for their help getting Safari working as documented at http://www.derekallard.com/blog/post/conditionally-sticky-sidebar // for their help getting Safari working as documented at http://www.derekallard.com/blog/post/conditionally-sticky-sidebar
if( window.XMLHttpRequest ) { // IE 6 doesn't implement position fixed nicely... if( window.XMLHttpRequest ) { // IE 6 doesn't implement position fixed nicely...
if (document.documentElement.scrollTop > 190 || self.pageYOffset > 190) { if (document.documentElement.scrollTop > 190 || self.pageYOffset > 190) {
$('#left-col').css('position', 'fixed'); $('#left-col').css('position', 'fixed');
$('#left-col').css('top', '10px'); $('#left-col').css('top', '10px');
} else if (document.documentElement.scrollTop < 200 || self.pageYOffset < 200) { } else if (document.documentElement.scrollTop < 200 || self.pageYOffset < 200) {
Expand All @@ -17,7 +20,7 @@
} }
} }
} }

*/


function hide_add_area() function hide_add_area()
{ {
Expand All @@ -31,6 +34,7 @@
function show_add_area() function show_add_area()
{ {
add_area.slideDown(); add_area.slideDown();
return false;
} }


function hide_add_instance() function hide_add_instance()
Expand All @@ -43,13 +47,24 @@


function show_add_instance(area_slug) function show_add_instance(area_slug)
{ {
instance_html = add_instance.detach(); $('div#area-' + area_slug).before(add_instance.detach());


$('div#area-' + area_slug).before(instance_html); add_instance.slideDown();
}

function hide_edit_instance()
{
$('input, select, textarea', add_instance).attr('value', '');


console.debug(instance_html); // Hide the form
edit_instance.slideUp();
}

function show_edit_instance(area_slug)
{
$('div#area-' + area_slug).before(edit_instance.detach());


add_instance.slideDown(); edit_instance.slideDown();
} }


// Drag/drop stuff // Drag/drop stuff
Expand All @@ -71,7 +86,7 @@
area_slug = this.id.replace(/^area-/, ''); area_slug = this.id.replace(/^area-/, '');
widget_slug = $(event.originalEvent.originalTarget).parent('li').attr('id').replace(/^widget-/, ''); widget_slug = $(event.originalEvent.originalTarget).parent('li').attr('id').replace(/^widget-/, '');


$.post(BASE_URI + 'widgets/ajax/show_widget_instance_form', { area_slug: area_slug, widget_slug: widget_slug}, function(html){ $.post(BASE_URI + 'widgets/ajax/add_widget_instance_form', { area_slug: area_slug, widget_slug: widget_slug}, function(html){
$('form', add_instance).html(html); $('form', add_instance).html(html);
show_add_instance(area_slug); show_add_instance(area_slug);
}); });
Expand All @@ -83,14 +98,11 @@


add_area = $('div#add-area-box'); add_area = $('div#add-area-box');
add_instance = $('div#add-instance-box'); add_instance = $('div#add-instance-box');
edit_instance = $('div#edit-instance-box');


// Widget Area add / remove -------------- // Widget Area add / remove --------------


$('a#add-area').click(function() $('a#add-area').click(show_add_area);
{
show_add_area();
return false;
});


$('div#add-area-box form').submit(function() $('div#add-area-box form').submit(function()
{ {
Expand Down Expand Up @@ -144,13 +156,54 @@
widget_area_slug = $('input[name="widget_area_slug"]', this).val(); widget_area_slug = $('input[name="widget_area_slug"]', this).val();
title = $('input[name="widget_area_id"]', this).val(); title = $('input[name="widget_area_id"]', this).val();


form = $(this);

if(!title || !widget_id || !widget_area_id) return false; if(!title || !widget_id || !widget_area_id) return false;


$.post(BASE_URI + 'widgets/ajax/add_widget_instance', $(this).serialize(), function() { $.post(BASE_URI + 'widgets/ajax/add_widget_instance', $(this).serialize(), function(data) {
hide_add_instance();


$('#area-' + widget_area_slug + ' #widget-list').load(BASE_URI + 'widgets/ajax/list_widgets/' + widget_area_slug); if(data.status == 'success')
}); {
hide_add_instance();

$('#area-' + widget_area_slug + ' #widget-list').load(BASE_URI + 'widgets/ajax/list_widgets/' + widget_area_slug);
}

else
{
form.html(data.form);
}

}, 'json');

return false;
});

// Edit widget instance
$('div#edit-instance-box form').submit(function()
{
widget_id = $('input[name="widget_id"]', this).val();
widget_area_id = $('input[name="widget_area_id"]', this).val();
widget_area_slug = $('input[name="widget_area_slug"]', this).val();
title = $('input[name="widget_area_id"]', this).val();

if(!title || !widget_id || !widget_area_id) return false;

$.post(BASE_URI + 'widgets/ajax/edit_widget_instance', $(this).serialize(), function(data) {

if(data.status == 'success')
{
hide_add_instance();

$('#area-' + widget_area_slug + ' #widget-list').load(BASE_URI + 'widgets/ajax/list_widgets/' + widget_area_slug);
}

else
{
alert('fail');
}

}, 'json');


return false; return false;
}); });
Expand All @@ -171,7 +224,20 @@
} }


}).disableSelection(); }).disableSelection();



$('.widget-area table a.edit-instance').live('click', function(){

id = $(this).closest('tr').attr('id').replace('instance-', '');
area_slug = $(this).closest('div.widget-area').attr('id').replace('area-', '');

$.post(BASE_URI + 'widgets/ajax/edit_widget_instance_form', { instance_id: id }, function(html){
$('form', edit_instance).html(html);
show_edit_instance(area_slug);
});

return false;
});


}); });


Expand Down
2 changes: 1 addition & 1 deletion application/modules/core/widgets/language/english/widgets_lang.php
View file
Expand Up @@ -14,7 +14,7 @@


// Widget instance titles // Widget instance titles
$lang['widgets.add_instance'] = 'Add widget instance'; $lang['widgets.add_instance'] = 'Add widget instance';
$lang['widgets.edit_instance'] = 'Edit widget instance';
$lang['widgets.delete_instance'] = 'Delete widget instance'; $lang['widgets.delete_instance'] = 'Delete widget instance';



?> ?>

0 comments on commit 92aed78

Please sign in to comment.