Changeset 11645 for branches

Timestamp:

11/12/08 18:16:59 (8 weeks ago)

Author:

iclerencia@…

Message:

Fix several problems with dragging stuff around.
Calculate urls to reload automatically instead of on load time (what didn't
work anymore for obvious reasons :P)

Location:

branches/iclerencia/dashboard/client/ebox/src

Files:

• EBox/Module.pm (modified) (1 diff)
• templates/dashboard/configurewidgets.mas (modified) (2 diffs)
• templates/dashboard/index.mas (modified) (6 diffs)

branches/iclerencia/dashboard/client/ebox/src/EBox/Module.pm

@@ -709 +709 @@
     if(defined($winfo)) {
         my $widget = $winfo->{'widget'}->($self, $name, $winfo->{'title'});
+        $widget->{'module'} = $self->{'name'};
         unless(UNIVERSAL::can($widget,'isa') and
                $widget->isa('EBox::Dashboard::Widget')) {

branches/iclerencia/dashboard/client/ebox/src/templates/dashboard/configurewidgets.mas

@@ -43 +43 @@
                 var wid = "widget_" + module + ":" + widname;
                 var drag = new Draggable(wid, {
-                    onStart: function(d) {
-                        if(!this.loaded) { 
-                            new Ajax.Updater(d.element.id,
-                                    '/ebox/Dashboard/Widget?module=' +
-                                    d.module + '&widget=' + d.widget, {
-                                method: 'get',
-                                onComplete: function() {
-                                    var elements = $(d.element.id).getElementsByClassName('closeBox');
-                                    Effect.toggle(elements[0],'appear');
-                                }
-                            });
-                            this.loaded = true;
+                    onDrag: function(d,e) {
+                        if(e.clientY > 100) {
+                            if(!this.loaded) { 
+                                new Ajax.Updater(d.element.id,
+                                        '/ebox/Dashboard/Widget?module=' +
+                                        d.module + '&widget=' + d.widget, {
+                                    method: 'get',
+                                    onComplete: function() {
+                                        var elements = $(d.element.id).getElementsByClassName('closeBox');
+                                        Effect.toggle(elements[0],'appear');
+                                    }
+                                });
+                                this.loaded = true;
+                            }
                         }
                     },
@@ -71 +73 @@
             var func = null;
             if(widget_name_list[j].indexOf("dashboard") == 0) {
-                func = function(dashboard) {
-                    var id = dashboard.id;
-                    new Ajax.Request("/ebox/Dashboard/Update", {
-                        method: "post",
-                        parameters: { dashboard: id, widgets: Sortable.sequence(id).join(',') }
-                    });
-                };
+                Sortable.create(widget_name_list[j], {
+                    tag: "div",
+                    handle: "widgetHandle",
+                    dropOnEmpty: true,
+                    constraint: false,
+                    scroll: window,
+                    containment: widget_name_list,
+                    onUpdate: function(dashboard) {
+                        var id = dashboard.id;
+                        new Ajax.Request("/ebox/Dashboard/Update", {
+                            method: "post",
+                            parameters: { dashboard: id, widgets: Sortable.sequence(id).join(',') }
+                        });
+                    }
+                });
             } else {
-                func = function() {};
+                var d = new Draggable(widget_name_list[j], {
+                    handle: "widgetHandle",
+                    constraint: false,
+                    scroll: window
+                });
+                d.element.onChange = function() {}
+                Sortable.sortables[d.element.id] = d.element;
             }
-            Sortable.create(widget_name_list[j], {
-                tag: "div",
-                handle: "widgetHandle",
-                dropOnEmpty: true,
-                constraint: false,
-                scroll: window,
-                containment: widget_name_list,
-                onUpdate: func
-            });
         }
     }

branches/iclerencia/dashboard/client/ebox/src/templates/dashboard/index.mas

@@ -6 +6 @@
 <%init>
 use EBox::Gettext;
-my @urls;
 </%init>
 <link href="/data/css/modalbox.css" rel="stylesheet" type="text/css" />
@@ -57 +56 @@
 <br/>
 % foreach my $widget (@dashboard1) {
-%   push(@urls, '/ebox/Dashboard/WidgetJSON?module=' . $widget->{module} . '&widget=' . $widget->{name});
     <& dashboard/widget.mas, widget => $widget, toggled => \%toggled &>
 % }
@@ -64 +62 @@
 <br/>
 % foreach my $widget (@dashboard2) {
-%   push(@urls, '/ebox/Dashboard/WidgetJSON?module=' . $widget->{module} . '&widget=' . $widget->{name});
     <& dashboard/widget.mas, widget => $widget, toggled => \%toggled &>
 % }
@@ -127 +124 @@
 % }
 
-% my $urlstr = join(",", map {qq/"$_"/} @urls);
-var urls = new Array(<% $urlstr %>);
-
 function updateWidget(widget) {
     if(widget == null) {
@@ -135 +129 @@
     }
     widget.sections.each(function(s) {
-        var sectname = widget.name + '_' + s.name;
+        var sectname = widget.module + ":" + widget.name + '_' + s.name;
         s.items.each(function(item,i) {
             var itemname = sectname + '_' + i;
@@ -183 +177 @@
 
 function updateWidgets() {
-    urls.each(function(u) {
-        new Ajax.Request(u, {
+    var widgets = Sortable.sequence("dashboard1").concat(Sortable.sequence("dashboard2"));
+    widgets.each(function(w) {
+        var parts = w.split(':');
+        var url = '/ebox/Dashboard/WidgetJSON?module=' + parts[0] + '&widget=' + parts[1];
+        new Ajax.Request(url, {
             method: "get",
             asynchronous: false,