Merge branch 'master' of git://github.com/talmdal/gallery3 into talmdal_branch

1 files changed, 23 insertions, 92 deletions

diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 194a2a19..3e58f3f3 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -1,56 +1,45 @@
 (function($) {
-  $.fn.organize = function(options) {
+  $.fn.organize = function() {
     var size = $.getViewportSize();
     var height = size.height() - 100;     // Leave 50 pixels on the top and bottom of the dialog
     var width = size.width() - 100;       // Leave 50 pixels on the left and right of the dialog
-    var opts = $.extend({}, $.fn.organize.defaults, {width: width, height: height}, options);
     return this.each(function() {
       $(this).click(function(event) {
         var href = event.target.href;
-        var size = $.getViewportSize();
 
         $("body").append('<div id="gOrganizeDialog"></div>');
 
-        $("#gOrganizeDialog").dialog(opts);
-        // Pass the approx height and width of the thumb grid to optimize thumb retrieval
+        $("#gOrganizeDialog").dialog({
+          autoOpen: false,
+          modal: true,
+          resizable: false,
+          width: width,
+          height: height,
+          position: "center",
+          close: function () {
+            $("#gOrganizeDialog").dialog("destroy").remove();
+            document.location.reload();
+         },
+          zIndex: 75
+        });
         $.get(href, _init);
         return false;
       });
     });
   };
 
-  $.fn.organize.defaults = {
-    autoOpen: false,
-    modal: true,
-    resizable: false,
-    minWidth: 600,
-    minHeight: 500,
-    position: "center",
-    close: function () {
-      $("#gOrganizeDialog").trigger("organize_close");
-      $("#gOrganizeDialog").dialog("destroy").remove();
-    },
-    zIndex: 75
-  };
-
   /**
    * Dynamically initialize the organize dialog when it is displayed
    */
   function _init(data) {
-    // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
+    // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 (target 1.8?)
     $(".sf-menu li.sfHover ul").css("z-index", 70);
 
     $("#gOrganizeDialog").html(data);
     $("#gOrganizeDialog").dialog("open");
 
-    var heightMicroThumbPanel = $("#gOrganizeDialog").innerHeight();
-    heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom"));
-    heightMicroThumbPanel -= $("#gMessage").outerHeight();
-    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel);
-    $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
-
-    heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight();
-    $("#gMicroThumbPanel").height(heightMicroThumbPanel);
+    var height = $("#gOrganizeDetail").innerHeight();
+    $("#gMicroThumbPanel").height(height - $("#gOrganizeEditDrawerHandle").outerHeight());
 
     if ($("#gOrganizeDialog h1").length) {
       $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog h1:eq(0)").html());
@@ -58,54 +47,12 @@
       $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog fieldset legend:eq(0)").html());
     }
 
-    $("#gOrganizeDialog #gMicroThumbDone").click(_dialog_close);
-    $("#gOrganizeDialog").bind("organize_close", function(target) {
-      $.gallery_reload();
+    $("#gOrganizeDialog #gMicroThumbDone").click(function(event) {
+      $("#gOrganizeDialog").dialog("close");
     });
 
     $(".gBranchText span").click(_collapse_or_expanded_tree);
     $(".gBranchText").click(_setContents);
-
-    //$(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
-    //$(".gBranchText").droppable(treeDroppable);
-
-    //$("#gMicroThumbPanel").droppable(thumbDroppable);
-    //$("#gMicroThumbPanel").selectable(selectable);
-    //$("#gOrganizeEditDrawerHandle a").click(drawerHandleButtonsClick);
-
-    $(window).bind("resize", _size_dialog);
-  };
-
-  /**
-   * Dynamically initialize the organize dialog when it is displayed
-   */
-  function _size_dialog(event) {
-    var size = $.getViewportSize();
-    var h = $("#gOrganizeDialog").dialog("option", "minHeight");
-    var sh = size.height() - 100;
-    var height  = Math.max(sh, h);
-    var w = $("#gOrganizeDialog").dialog("option", "minWidth");
-    var sw = size.width() - 100;
-    var width = Math.max(w, sw);
-
-    $("#gOrganizeDialog").parent().css("height", height);
-    $("#gOrganizeDialog").parent().css("width", width);
-    $("#gOrganizeDialog").parent().css("left", "50px");
-    $("#gOrganizeDialog").parent().css("top", "50px");
-
-    var heightMicroThumbPanel = height - 50;
-    heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom"));
-    heightMicroThumbPanel -= $("#gMessage").outerHeight();
-    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel);
-    $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
-
-    heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight();
-    $("#gMicroThumbPanel").height(heightMicroThumbPanel);
-  };
-
-  function _dialog_close(event) {
-    event.preventDefault();
-    $("#gOrganizeDialog").dialog("close");
   };
 
   /**
@@ -113,26 +60,12 @@
    */
   function _collapse_or_expanded_tree(event) {
     event.stopPropagation();
-    var id = $(event.currentTarget).attr("ref");
     if ($(event.currentTarget).hasClass("ui-icon-minus")) {
-      $(event.currentTarget).removeClass("ui-icon-minus");
-      $(event.currentTarget).addClass("ui-icon-plus");
-      $("#gOrganizeChildren-" + id).hide();
+      $(event.currentTarget).removeClass("ui-icon-minus").addClass("ui-icon-plus");
     } else {
-      if ($("#gOrganizeChildren-" + id).is("div")) {
-        $("#gOrganizeChildren-" + id).remove();
-        $("#gOrganizeBranch-" + id).after("<ul id=\"gOrganizeChildren-" + id + "></ul>");
-        var url = $("#gOrganizeAlbumTree").attr("ref").replace("__ITEM_ID__", id);
-        $.get(url, function(data) {
-          $("#gOrganizeChildren-" + id).html(data);
-          $(".gBranchText span").click(_collapse_or_expanded_tree);
-          $(".gBranchText").click(_setContents);
-        });
-      }
-      $("#gOrganizeChildren-" + id).show();
-      $(event.currentTarget).removeClass("ui-icon-plus");
-      $(event.currentTarget).addClass("ui-icon-minus");
+      $(event.currentTarget).removeClass("ui-icon-plus").addClass("ui-icon-minus");
     }
+    $("#gOrganizeChildren-" + $(event.currentTarget).attr("ref")).toggle();
   }
 
   /**
@@ -145,14 +78,12 @@
     }
     var id = $(event.currentTarget).attr("ref");
     $(".gBranchSelected").removeClass("gBranchSelected");
-    $(event.currentTarget).addClass("gBranchSelected");
+    $("#gOrganizeBranch-" + id).addClass("gBranchSelected");
     var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
     $.get(url, function(data) {
       $("#gMicroThumbGrid").html(data);
     });
-
   }
-
 })(jQuery);
 
 $("document").ready(function() {