cedar 0.2.82.pre → 0.2.89.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9489f71f4c64956b601439ebccd7a1951e3dfc1
-  data.tar.gz: 8f1b3ff8d3889f83e3372a94763df7a9c9e9e626
+  metadata.gz: 61cd279be961e3cd97cad704240677073eacd27d
+  data.tar.gz: 1f3d0e661c90041381875e2495670faeef9a5d17
 SHA512:
-  metadata.gz: 1add793e38210458c71ad374f535c83562ba2db8ffd68bfc89a69beec67f4b79d013f60d76e74d13e50bd168e9e621053fdc01fe6a2bc4e8f2ac3b03c50f7800
-  data.tar.gz: 2501c0dea5b3c611eb95f1011d457da1ba6555457626c25e4e9cd7f602774f7c3860828388214af5cb22ccec3568d3592f38cd1f0ef5a5574089231aa1a56cb1
+  metadata.gz: 2fd8439a3a20c9ac3fa86cd8fc258e6fc671ff074e5fe12f0577cff47a1db979cbf2c24339806c7b112ae92167b9604b716fc3508b561de99ab2097bdb6ca384
+  data.tar.gz: 70d27a853e183c1585b6c467f58ef361cb4b144043010db5d3f52e99c0e5500e245e700dfdf163124561038d49a91fcf9097ac6c74abb975a7d4064afb79ecff

data/lib/assets/javascripts/cedar.js

@@ -1,2 +1,3 @@
 //= require cedar_config
+//= require cedar_admin
 //= require cedar_source

data/lib/assets/javascripts/cedar_admin.js

@@ -0,0 +1,152 @@
+window.Cedar = window.Cedar || {};
+
+Cedar.Admin = function() {
+  if (this.isEditMode()) {
+    this.showGlobalActions();
+  }
+
+  this.scanDOM();
+  this.observeDOM('body', _.bind(function() {
+    this.scanDOM();
+  }, this));
+};
+
+Cedar.Admin.prototype.scanDOM = function() {
+  var cedarClass = "cedar-cms-editable";
+  if (this.isEditMode()) {
+    $('[data-cedar-type]').each(_.bind(function(index, el){
+      var $el = $(el);
+      if (!$el.hasClass(cedarClass)) {
+        var editTools = $(this.getEditTools($el.data()));
+        $el.prepend(editTools);
+        $el.addClass(cedarClass + " clearfix");
+      }
+    }, this));
+  }
+};
+
+Cedar.Admin.prototype.observeDOM = function(selector, callback) {
+  var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
+  if (MutationObserver){
+    var observer = new MutationObserver(function(mutations, observer) {
+      if (mutations[0].addedNodes.length || mutations[0].removedNodes.length) {
+        observer.disconnect();
+        callback();
+        observer.observe($(selector)[0], { childList:true, subtree:true });
+      }
+    });
+    observer.observe($(selector)[0], { childList:true, subtree:true });
+  }
+};
+
+Cedar.Admin.prototype.isEditMode = function() {
+  return this.hasEditModeCookie() || this.hasEditModeUrl();
+};
+
+Cedar.Admin.prototype.hasEditModeUrl = function() {
+  var sPageURL = window.location.search.substring(1);
+  var sURLVariables = sPageURL.split('&');
+  var i = 0;
+  while (i < sURLVariables.length) {
+    if (sURLVariables[i] === 'cdrlogin') {
+      document.cookie = "cedarEditMode=";
+      return true;
+    }
+    i++;
+  }
+  return false;
+};
+
+Cedar.Admin.prototype.hasEditModeCookie = function() {
+  return (new RegExp("(?:^|;\\s*)cedarEditMode\\s*\\=")).test(document.cookie);
+};
+
+Cedar.Admin.prototype.showGlobalActions = function() {
+  $(document).ready(_.bind(function() {
+    var $body = $('body');
+    var globalActions = '<div class="cedar-cms-global-actions">' +
+      '<a class="cedar-cms-global-action js-cedar-cms-log-off" href="#">' +
+      '<span class="cedar-cms-icon cedar-cms-icon-nav"></span> ' +
+      '<span class="cedar-cms-global-action-label">Log Off</span>' +
+      '</a>' +
+      '</div>';
+    $body.append(globalActions);
+    $('.js-cedar-cms-log-off').on('click', _.bind(function(e) {
+      this.logOff(e);
+    }, this));
+  }, this));
+};
+
+Cedar.Admin.prototype.logOff = function(event) {
+  event.preventDefault();
+  document.cookie = "cedarEditMode=; expires=Thu, 01 Jan 1970 00:00:00 GMT";
+  if (location.href === this.getLogOffURL()) {
+    location.reload(true);
+  } else {
+    window.location.href = this.getLogOffURL();
+  }
+};
+
+Cedar.Admin.prototype.getLogOffURL = function() {
+  return this.removeURLParameter(window.location.href, 'cdrlogin');
+};
+
+Cedar.Admin.prototype.getEditLink = function(options) {
+  var output = Cedar.config.server + '/cmsadmin/';
+  output += options.cedarType === 'ContentEntry' ? 'Edit' : 'Select';
+  output += 'Data?cdr=1&t=' + options.cedarType + '&o=' + encodeURIComponent(options.cedarId);
+
+  return output;
+};
+
+Cedar.Admin.prototype.getEditTools = function(options) {
+  var jsString = "if(event.stopPropagation){event.stopPropagation();}" +
+  "event.cancelBubble=true;" +
+  "window.location.href=this.attributes.href.value + \'&referer=' + encodeURIComponent(window.location.href) + '\';" +
+  "return false;";
+
+  var iconClass = options.cedarType === 'ContentEntry' ? 'edit' : 'list';
+
+  var block = '<span class="cedar-cms-edit-tools">';
+  block += '<a onclick="' + jsString + '" href="' + this.getEditLink(options) +
+           '" class="cedar-cms-edit-icon cedar-js-edit" >';
+  block += '<i class="cedar-cms-icon cedar-cms-icon-right cedar-cms-icon-' + iconClass + '"></i></a>';
+  block += '</span>';
+  return block;
+};
+
+// adapted from stackoverflow:
+// http://stackoverflow.com/questions/1634748/how-can-i-delete-a-query-string-parameter-in-javascript
+Cedar.Admin.prototype.removeURLParameter = function(url, parameter) {
+  var splitUrl = url.split('#');
+  var serverUrl = splitUrl[0];
+  var clientUrl = splitUrl[1] || '';
+  if (clientUrl) {
+    clientUrl = '#' + clientUrl;
+  }
+  // prefer to use l.search if you have a location/link object
+  var splitServerUrl= serverUrl.split('?');
+  if (splitServerUrl.length>=2) {
+
+    var prefix = encodeURIComponent(parameter); //+'=';
+    var pars = splitServerUrl[1].split(/[&;]/g);
+
+    //reverse iteration as may be destructive
+    var i = pars.length - 1;
+    while (i >= 0) {
+      // idiom for string.startsWith
+      if (pars[i].lastIndexOf(prefix, 0) !== -1) {
+        pars.splice(i, 1);
+      }
+      i--;
+    }
+
+    var updatedServerUrl= splitServerUrl[0];
+    if (pars.length > 0) {
+      updatedServerUrl += '?'+pars.join('&');
+    }
+    return updatedServerUrl + clientUrl;
+  } else {
+    return url;
+  }
+};

data/lib/assets/javascripts/cedar_handlebars.js

@@ -1,3 +1,9 @@
+if (_(Handlebars).isUndefined()) {
+  if (!_(Ember).isUndefined()) {
+    var Handlebars = Ember.Handlebars;
+  }
+}
+
 Handlebars.registerHelper('cedar', function(options) {
   "use strict";
 
@@ -71,11 +77,11 @@ Handlebars.registerHelper('cedar', function(options) {
     cedarObject.setContent(data);
 
     if (blockHelperStyle()) {
-      if (Cedar.auth.isEditMode()) {
+      if (Cedar.admin.isEditMode()) {
         output += cedarObject.getEditOpen();
       }
       output += unescapeHtml(options.fn(cedarObject.toJSON()));
-      if (Cedar.auth.isEditMode()) {
+      if (Cedar.admin.isEditMode()) {
         output += cedarObject.getEditClose();
       }
     } else {

data/lib/assets/javascripts/cedar_source.js

@@ -5,7 +5,7 @@ window.Cedar = window.Cedar || {};
 window.Cedar = $.extend({}, window.Cedar, {
   initialized: false,
   store: null,
-  auth: null
+  admin: null
 });
 window.Cedar.config = window.Cedar.config || {};
 
@@ -47,7 +47,8 @@ Cedar.Application = function(options) {
     wait: false,
     allowUnsecured: false,
     objectNameFilter: '',
-    liveMode: true
+    liveMode: true,
+    initHTML: false
   };
 
   this.options = $.extend({}, $.extend({}, defaults, window.Cedar.config), options);
@@ -63,6 +64,7 @@ Cedar.Application = function(options) {
   Cedar.config.fetch = this.options.fetch;
   Cedar.config.objectNameFilter = this.options.objectNameFilter;
   Cedar.config.liveMode = this.options.liveMode;
+  Cedar.config.initHTML = this.options.initHTML;
 
   if (Cedar.events === undefined) {
     Cedar.events = new Cedar.Events();
@@ -72,17 +74,15 @@ Cedar.Application = function(options) {
     Cedar.store = new Cedar.Store();
   }
 
-  if ( Cedar.auth === null ) {
-    Cedar.auth = new Cedar.Auth();
-  }
-
-  if (Cedar.auth.isEditMode()) {
-    this.showGlobalActions();
+  if ( Cedar.admin === null ) {
+    Cedar.admin = new Cedar.Admin();
   }
 
   Cedar.initialized = true;
 
-  this.initializeHTML();
+  if (Cedar.config.initHTML) {
+    this.initializeHTML();
+  }
 };
 
 Cedar.Application.prototype.initializeHTML = function() {
@@ -108,23 +108,6 @@ Cedar.Application.prototype.getProtocol = function() {
   }
 };
 
-Cedar.Application.prototype.showGlobalActions = function() {
-  $(document).ready(function() {
-    var $body = $('body');
-    var globalActions = '<div class="cedar-cms-global-actions">' +
-      '<a href="#" class="cedar-cms-global-action" onclick="window.location.reload();">' +
-      '<span class="cedar-cms-icon cedar-cms-icon-edit"></span> ' +
-      '<span class="cedar-cms-global-action-label">Refresh</span>' +
-      '</a><br>' +
-      '<a class="cedar-cms-global-action" href="' + Cedar.auth.getLogOffURL() + '">' +
-      '<span class="cedar-cms-icon cedar-cms-icon-edit"></span> ' +
-      '<span class="cedar-cms-global-action-label">Log Off Cedar</span>' +
-      '</a>' +
-      '</div>';
-    $body.append(globalActions);
-  });
-};
-
 /**
  * Cedar.Events
  */
@@ -144,73 +127,6 @@ Cedar.Events.prototype.on = function(eventName, eventCallback) {
   document.addEventListener(eventName, eventCallback);
 };
 
-/**
- * Cedar.Auth
- *
- * responsible for determining if we're in edit mode
- */
-Cedar.Auth = function() {
-  return;
-};
-
-Cedar.Auth.prototype.isEditMode = function() {
-  return this.isEditUrl();
-};
-
-Cedar.Auth.prototype.isEditUrl = function() {
-  var sPageURL = window.location.search.substring(1);
-  var sURLVariables = sPageURL.split('&');
-  var i = 0;
-  while (i < sURLVariables.length) {
-    if (sURLVariables[i] === 'cdrlogin') {
-      return true;
-    }
-    i++;
-  }
-  return false;
-};
-
-Cedar.Auth.prototype.getLogOffURL = function() {
-  return this.removeURLParameter(window.location.href, 'cdrlogin');
-};
-
-// adapted from stackoverflow:
-// http://stackoverflow.com/questions/1634748/how-can-i-delete-a-query-string-parameter-in-javascript
-Cedar.Auth.prototype.removeURLParameter = function(url, parameter) {
-  var splitUrl = url.split('#');
-  var serverUrl = splitUrl[0];
-  var clientUrl = splitUrl[1] || '';
-  if (clientUrl) {
-    clientUrl = '#' + clientUrl;
-  }
-  // prefer to use l.search if you have a location/link object
-  var splitServerUrl= serverUrl.split('?');
-  if (splitServerUrl.length>=2) {
-
-    var prefix = encodeURIComponent(parameter); //+'=';
-    var pars = splitServerUrl[1].split(/[&;]/g);
-
-    //reverse iteration as may be destructive
-    var i = pars.length - 1;
-    while (i >= 0) {
-      // idiom for string.startsWith
-      if (pars[i].lastIndexOf(prefix, 0) !== -1) {
-        pars.splice(i, 1);
-      }
-      i--;
-    }
-
-    var updatedServerUrl= splitServerUrl[0];
-    if (pars.length > 0) {
-      updatedServerUrl += '?'+pars.join('&');
-    }
-    return updatedServerUrl + clientUrl;
-  } else {
-    return url;
-  }
-};
-
-
 /**
  * Cedar.Store
  *
@@ -267,12 +183,12 @@ Cedar.Store.prototype.get = function(type, attributes) {
 
 // Retrieve the locally-stored model or collection if it exists
 Cedar.Store.prototype.cachedObject = function(type, attributes) {
-  var cachedCollection = _((this.cache[type] && JSON.parse(this.cache[type]) || []));
+  var cachedCollection = (this.cache[type] && JSON.parse(this.cache[type]) || []);
   var result;
   if (attributes && attributes.hasOwnProperty('id')) {
-    result = cachedCollection.findWhere(attributes);
+    result = _.findWhere(cachedCollection, attributes);
   } else {
-    result = cachedCollection.where(attributes);
+    result = _.where(cachedCollection, attributes);
   }
   return result;
 };
@@ -333,7 +249,7 @@ Cedar.Store.prototype.getRemote = function(options) {
     path: options.path,
     params: params,
     success: function(response) {
-      _.chain(response).each(function(collection, type) {
+      _.each(response, function(collection, type) {
         this.putCollection(type, collection);
         Cedar.debug("storing: " + type);
       }.bind(this));
@@ -465,7 +381,7 @@ Cedar.ContentObject.prototype = {
   },
 
   toString: function() {
-    return Cedar.auth.isEditMode() ? this.getContentWithEditTools() : this.getContent();
+    return Cedar.admin.isEditMode() ? this.getContentWithEditTools() : this.getContent();
   },
 
   toJSON: function() {
@@ -477,22 +393,10 @@ Cedar.ContentObject.prototype = {
   },
 
   getEditOpen: function() {
-    var jsString = "if(event.stopPropagation){event.stopPropagation();}" +
-    "event.cancelBubble=true;" +
-    "window.location.href=this.attributes.href.value + \'&referer=' + encodeURIComponent(window.location.href) + '\';" +
-    "return false;";
-
-    var block = '<span class="cedar-cms-editable clearfix">';
-    block += '<span class="cedar-cms-edit-tools">';
-    block += '<a onclick="' + jsString + '" href="' + Cedar.config.server +
-             '/cmsadmin/EditData?cdr=1&t=' +
-             this.options.cedarType +
-             '&o=' +
-             encodeURIComponent(this.options.cedarId) +
-             '" class="cedar-cms-edit-icon cedar-js-edit" >';
-    block += '<i class="cedar-cms-icon cedar-cms-icon-right cedar-cms-icon-edit"></i></a>';
-    block += '</span>';
-    return block;
+    return '<span ' +
+      'data-cedar-type="' + this.options.cedarType + '" ' +
+      'data-cedar-id="' + this.options.cedarId + '" ' +
+      '>';
   },
 
   getEditClose: function() {
@@ -513,7 +417,7 @@ Cedar.ContentEntry.prototype = Object.create(Cedar.ContentObject.prototype);
 Cedar.ContentEntry.prototype.constructor = Cedar.ContentEntry;
 
 Cedar.ContentEntry.prototype.setContent = function(data) {
-  this.content = (data && data.content) || '';
+  this.content = (data && data.content) || (data && (data.settings && data.settings.content)) || '';
 };
 
 Cedar.ContentEntry.prototype.toJSON = function(data) {

data/lib/assets/stylesheets/cedar_source.scss

@@ -16,6 +16,9 @@
   height: auto !important;
   margin: 0 !important;
 }
+div.cedar-cms-editable {
+  width: 100% !important;
+}
 
 .cedar-cms-editable:before {
   content: "";
@@ -99,9 +102,15 @@
 }
 
 
+.cedar-cms-icon-nav {
+  background-position: -67px 0;
+}
 .cedar-cms-icon-edit {
   background-position: -89px -20px;
 }
+.cedar-cms-icon-list {
+  background-position: -34px -40px;
+}
 
 /* Action Links */
 .cedar-cms-global-actions {
@@ -109,13 +118,15 @@
   top: 0;
   right: 0;
   text-align: left !important;
+  z-index: 1000000;
 }
 .cedar-cms-global-action {
   display: inline-block !important;
   color: #F65126 !important;
   background: #FFF !important;
+  font-size: 14px !important;
   line-height: 18px !important;
-  padding: 3px 4px 3px 3px !important;
+  padding: 2px 8px 3px 3px !important;
   text-decoration: none !important;
 }
 .cedar-cms-global-action * {

data/lib/cedar/version.rb

@@ -1,3 +1,3 @@
 module Cedar
-  VERSION = "0.2.82.pre"
+  VERSION = "0.2.89.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cedar
 version: !ruby/object:Gem::Version
-  version: 0.2.82.pre
+  version: 0.2.89.pre
 platform: ruby
 authors:
 - Jed Murdock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-01 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,6 +49,7 @@ files:
 - README.md
 - lib/assets/images/cedar-display-tools-sprite.png
 - lib/assets/javascripts/cedar.js
+- lib/assets/javascripts/cedar_admin.js
 - lib/assets/javascripts/cedar_config.js.erb
 - lib/assets/javascripts/cedar_handlebars.js
 - lib/assets/javascripts/cedar_source.js