Merge branch 'master' of git://github.com/swannodette/shiftspace

Author: mushon

client/core/ShiftFunctions.js

@@ -15,6 +15,12 @@ function SSGetShift(id)
   return p;
 }
 
+function SSGetShiftInstance(id)
+{
+  var shift = SSGetShift(id);
+  return SSSpaceForName(shift.space.name).getShift(id);
+}
+
 /*
 Function: SSInitShift
   Creates a new shift on the page.
@@ -191,7 +197,7 @@ var SSEditShift = function(space, shiftId)
   {
     var content = shift.content;
     SSFocusSpace(space, (content && content.position) || null);
-    var controlp = !space.hasShift(shiftId) ? space.addShift(shift, space.shiftUI()) : null;
+    var controlp = !space.hasShift(shiftId) ? space.addShift(shift) : null;
     (function(controlp) {
       space.editShift(shiftId);
       space.onShiftEdit(shiftId);
@@ -205,17 +211,17 @@ var SSEditShift = function(space, shiftId)
   }
 }.future();
 
+/*
+Function: SSEditExitShift
+  Exit the editing of a shift.
 
+Parameters:
+  space - a space instance.
+  shiftId - a shift id.
+*/
 function SSEditExitShift(space, shiftId)
 {
-  var shift = SSGetShift(shiftId);
-  if(space &&
-     !Promise.isPromise(space) &&
-     space.hasShift(shiftId) &&
-     space.shiftIsVisible(shiftId))
-  {
-    space.editExitShift(shiftId);
-  }
+  space.editExitShift(shiftId);
   SSPostNotification('onShiftLeaveEdit', shiftId);
   SSSetShiftBeingEdited(null);
 }

client/core/SpaceFunctions.js

@@ -169,6 +169,10 @@ function SSRegisterSpace(instance)
     SSPostNotification('onShiftFocus', id);
   });
   instance.addEvent('onShiftSave', function(id) {
+    SSPostNotification("onShiftSave", id);
+  });
+  instance.addEvent("onShiftDestroy", function(id) {
+    SSPostNotification("onShiftDestroy", id);
   });
 
   return instance;
@@ -211,7 +215,7 @@ function SSLoadDefaultSpacesAttributes()
           SSLog("Loaded attributes for", spaceName, SSLogSystem);
           defaultSpaces[spaceName] = attrs;
           defaultSpaces[spaceName].position = i;
-          if(i == (__defaultSpacesList.length-1)) 
+          if(i == (__defaultSpacesList.length-1))
           {
             SSInitDefaultSpaces(defaultSpaces);
             SSPostNotification("onDefaultSpacesAttributesLoad", defaultSpaces);

client/user/Shift.js

@@ -342,6 +342,23 @@ var ShiftSpaceShift = new Class({
     this.fireEvent('onShiftHide', this.getId());
   },
 
+  /*
+    Function: cancel
+      Function to cancel the editing of a shift as
+      well destroying a newly created shift.
+   */
+  cancel: function()
+  {
+    if(this.isNewShift())
+    {
+      this.destroy();
+    }
+    else
+    {
+      this.getParentSpace().hideShift(this.getId());
+    }
+  },
+
   /*
     Function: manageElement
       Sets the main view of the shift.  This lets ShiftSpace now what the main display

client/views/SSListView/SSListView.js

@@ -1280,10 +1280,16 @@ var SSListView = new Class({
     var theData = this.data(), len = theData.length, cell = this.cell();
     if(!$type(startIndex))
     {
-      this.element.getElements("li").destroy();
+      this.element.getElements("li:not(.SSPreserve)").destroy();
     }
     if(len > 0 && cell)
     {
+      if(this.options.preserveBottom)
+      {
+        var otherEls = this.element.getElements(".SSPreserve").map(function(x) {
+          return x.dispose();
+        });
+      }
       var perPage = (this.pageControl() && this.pageControl().perPage()) || len;
       if(this.options.horizontal && this.options.cellSize)
       {
@@ -1302,6 +1308,12 @@ var SSListView = new Class({
         }
         this.onAddCellNode(cellNode);
       }, this);
+      if(this.options.preserveBottom && otherEls)
+      {
+        otherEls.each(function(x) {
+          this.element.grab(x);
+        }.bind(this));
+      }
       this.setNeedsDisplay(false);
       this.initSortables();
     }

client/views/SSNotifierView/SSNotifierView.js

@@ -23,6 +23,8 @@ var SSNotifierView = new Class({
     SSAddObserver(this, 'onSpaceMenuHide', this.onSpaceMenuHide.bind(this));
     SSAddObserver(this, 'onNewShiftSave', this.onNewShiftSave.bind(this));
     SSAddObserver(this, 'onShiftEdit', this.onShiftEdit.bind(this));
+    SSAddObserver(this, 'onShiftHide', this.onShiftHide.bind(this));
+    SSAddObserver(this, 'onShiftDestroy', this.onShiftDestroy.bind(this));
     SSAddObserver(this, 'onShiftLeaveEdit', this.onShiftLeaveEdit.bind(this));
     SSAddObserver(this, 'onShiftCheck', this.onShiftCheck.bind(this));
     SSAddObserver(this, 'onShiftUncheck', this.onShiftUncheck.bind(this));
@@ -79,8 +81,9 @@ var SSNotifierView = new Class({
   },
 
 
-  onShiftEdit: function()
+  onShiftEdit: function(shiftId)
   {
+    SSLog("onShiftEdit", shiftId, SSLogForce);
     this.fireEvent('edit');
   },
 
@@ -91,6 +94,16 @@ var SSNotifierView = new Class({
   },
 
 
+  onShiftHide: function(shiftId)
+  {
+  },
+
+
+  onShiftDestroy: function(shiftId)
+  {
+  },
+
+
   currentListView: function()
   {
     return this.__currentListView;
@@ -420,12 +433,17 @@ var SSNotifierView = new Class({
 
     this.SSQPCancel.addEvent("click", function(evt) {
       evt = new Event(evt);
-      var id = this.currentListView().checkedItemIds()[0];
-      if(SSIsNewShift(id))
+      var itemIds = (this.currentListView()) ? this.currentListView().checkedItemIds() : [];
+      if(itemIds.length == 0 && this.__newShiftId)
       {
+        // NOTE: might be breaking encapsulation a little too much - David 9/5/10
+        SSGetShiftInstance(this.__newShiftId).destroy();
+        this.hideQuickPane();
       }
       else
       {
+        SSLog("showQuickEditPane", SSLogForce);
+        var id = itemIds[0];
         SSEditExitShift(SSSpaceForShift(id), id);
         this.hideQuickPane();
         this.showQuickEditPane();
@@ -441,10 +459,12 @@ var SSNotifierView = new Class({
 
     this.SSQEPEdit.addEvent("click", function(evt) {
       evt = new Event(evt);
-      var id = this.currentListView().checkedItemIds()[0];
+      var id = this.currentListView().checkedItemIds()[0],
+          idx = this.currentListView().checkedItemIndices()[0];
       SSEditShift(SSSpaceForShift(id), id);
       this.hideQuickEditPane();
       this.showQuickPane(SSGetShift(id));
+      this.currentListView().selectRow(idx);
     }.bind(this));
 
     this.SSQEPShare.addEvent("click", function(evt) {
@@ -455,6 +475,7 @@ var SSNotifierView = new Class({
     this.SSQEPDelete.addEvent("click", function(evt) {
       evt = new Event(evt);
       var ids = this.currentListView().checkedItemIds();
+
       ids.each($comp(SSDeleteShift, $msg('realize')));
     }.bind(this));
   },
@@ -663,6 +684,7 @@ var SSNotifierView = new Class({
 
   onNewShiftShow: function(id, status)
   {
+    this.__newShiftId = id;
     this.showQuickPane(SSGetShift(id));
   },
 
@@ -692,6 +714,12 @@ var SSNotifierView = new Class({
   {
     this.SSQuickPane.addClass("SSDisplayNone");
   },
+
+
+  isQuickPaneVisible: function()
+  {
+    return !this.SSQuickPane.hasClass("SSDisplayNone");
+  },
 
 
   showQuickEditPane: function()
@@ -705,6 +733,12 @@ var SSNotifierView = new Class({
     this.SSQuickEditPane.addClass("SSDisplayNone");
   },
 
+
+  isQuickEditPaneVisible: function(args)
+  {
+    return !this.SSQuickEditPane.hasClass("SSDisplayNone");
+  },
+
 
   buildInterface: function()
   {

client/views/SSNotifierView/SSNotifierViewFrame.css

@@ -7,7 +7,7 @@
   height: 44px;
   overflow: hidden;
   width: 40px;
-  z-index: 1000001;
+  z-index: 1000004;
 }
 
 .SSNotifierHidden