cedar 0.2.2.pre → 0.2.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2950b665fbe82d9d8ab1caccbc0d5edc85652b
-  data.tar.gz: 3e78607fc3fd68a95cbcf05091938abd2c0744a4
+  metadata.gz: f7d74b293b2538cffefe506978bd5c83c6f7e125
+  data.tar.gz: bc52ad897fcc6eaa77dc2bf73b048fe3d58b8d8f
 SHA512:
-  metadata.gz: 48ff2dc4745c1627f012426f956d1d171f2437de4fd3092f76482f230376bed99e21e1dd504f42e9ef9d547387525ad90296340894eb4795e4c8b01ebb06d2ff
-  data.tar.gz: 269b10bb9838954318ada7681bd7d324ad8e0e1cb117c2c29988b70a98ac9e6e284b53fc8061846442ad1b3d72b6a66b9d97733e0184ed1d92fba099aee01eda
+  metadata.gz: ed3977de0160ec57f098be971cc9aab6ecc163cdd0cd84c326772051ff604d46b650b3c84927ab73a733f1998a5aa8875fc37684fcf1d857a489d61422852860
+  data.tar.gz: 60f2081e495fb9080b125e78c1bcc67f01ae4118d82848ce709bfb21e64db5583495f43dfe336eaadaf5274824c17f5046b87f82b43592e86c39230e870086b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cedar (0.2.2.pre)
+    cedar (0.2.3.pre)
 
 GEM
   remote: https://rubygems.org/

data/lib/assets/javascripts/cedar.js

@@ -53,6 +53,7 @@ Cedar.Application = function(options) {
   var defaults = {
     debug: false,
     fetch: true,
+    wait: false,
     forceHttps: false
   };
 
@@ -65,6 +66,12 @@ Cedar.Application = function(options) {
   Cedar.config.server = this.getProtocol() + this.options.server;
   Cedar.config.api = this.getProtocol() + this.options.server + '/api';
   Cedar.config.debug = this.options.debug;
+  Cedar.config.wait = this.options.wait;
+  Cedar.config.fetch = this.options.fetch;
+
+  if (typeof Cedar.$ === "undefined") {
+    Cedar.$ = jQuery({});
+  }
 
   if ( Cedar.store === null ) {
     Cedar.store = new Cedar.Store();
@@ -78,11 +85,28 @@ Cedar.Application = function(options) {
     this.showGlobalActions();
   }
 
-  if (this.options.fetch) {
+  if (Cedar.config.fetch) {
     Cedar.store.fetched = Cedar.store.fetch();
   }
 
   Cedar.initialized = true;
+
+  this.initializeHTML()
+}
+
+Cedar.Application.prototype.initializeHTML = function() {
+  $('[data-cedar-id]').each(function(){
+    var $this = $(this);
+    $this.data("cedarObject", new Cedar.ContentEntry({
+      el: this,
+      cedarId: $this.data("cedarId")
+    }));
+
+    Cedar.$.on("content:loaded", function() {
+      $this.data("cedarObject").render();
+    }.bind(this));
+  });
+  Cedar.$.trigger("content:loaded");
 }
 
 Cedar.Application.prototype.getProtocol = function() {
@@ -138,7 +162,10 @@ Cedar.Auth.prototype.getLogOffURL = function() {
 Cedar.Auth.prototype.removeURLParameter = function(url, parameter) {
   var splitUrl = url.split('#');
   var serverUrl = splitUrl[0];
-  var clientUrl = splitUrl[1];
+  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) {
@@ -158,7 +185,7 @@ Cedar.Auth.prototype.removeURLParameter = function(url, parameter) {
     if (pars.length > 0) {
       updatedServerUrl += '?'+pars.join('&');
     }
-    return updatedServerUrl + "#" + clientUrl;
+    return updatedServerUrl + clientUrl;
   } else {
     return url;
   }
@@ -202,11 +229,14 @@ Cedar.Store.prototype.get = function ( object, key ) {
   if ( object.apiGet() === null ) {
     throw 'Cedar Error: must provide api "get" path';
   }
-  if (typeof localStorage[key] !== "undefined") {
+
+  if (Cedar.store.loaded || (object.hasLocalContent() && !Cedar.config.wait)) {
+    Cedar.debug("loaded in get: " + Cedar.store.loaded);
     Cedar.debug('get from cache: ' + key);
     return $.Deferred().resolve(localStorage[key]);
+
   } else {
-    Cedar.debug('checking server...');
+    Cedar.debug("loaded: " + Cedar.store.loaded);
     return $.getJSON(Cedar.config.api + object.apiGet() + key, function(json) {
       Cedar.debug('get from server: ' + key);
       Cedar.store.put(key, json);
@@ -235,7 +265,9 @@ Cedar.Store.prototype.fetch = function ( options ) {
     this.clear();
   }
 
-  return $.when(Cedar.store.checkData()).then( function() {
+  return $.when(Cedar.store.checkData()).then( function(response) {
+
+    Cedar.debug("fetch data check complete");
 
     if (Cedar.store.loaded) {
 
@@ -252,7 +284,9 @@ Cedar.Store.prototype.fetch = function ( options ) {
             Cedar.debug("storing: " + val.id);
           }
         });
+        Cedar.debug("setting loaded to true");
         Cedar.store.loaded = true;
+        Cedar.$.trigger("content:loaded");
       });
     }
 
@@ -295,15 +329,17 @@ Cedar.Store.prototype.getVersion = function() {
  */
 Cedar.Store.prototype.checkData = function() {
   Cedar.debug("checking version #" + Cedar.store.getVersion());
-  return $.getJSON(Cedar.config.api + '/queries/status').done( function(json) {
+  return $.when($.getJSON(Cedar.config.api + '/queries/status'))
 
-    if ( Cedar.store.getVersion() != json.settings.version ) {
-      Cedar.debug('setting version: ' + json.settings.version);
+  .then( function(response) {
+    if ( Cedar.store.getVersion() != response.settings.version ) {
+      Cedar.debug('setting version: ' + response.settings.version);
       Cedar.store.loaded = false;
-      Cedar.store.setVersion(json.settings.version);
-    }
-    else {
+      Cedar.store.setVersion(response.settings.version);
+    } else {
+      Cedar.debug("version is up to date");
       Cedar.store.loaded = true;
+      Cedar.$.trigger("content:loaded");
     }
   });
 }
@@ -321,7 +357,7 @@ Cedar.Store.prototype.checkData = function() {
  */
 Cedar.ContentEntry = function(options) {
   var defaults = {
-    el: 'div'
+    el: '<div />'
   };
 
   this.options = $.extend( {}, defaults, options );
@@ -347,20 +383,35 @@ Cedar.ContentEntry.prototype.apiList = function() {
   return 'guidlist';
 };
 
+Cedar.ContentEntry.prototype.hasLocalContent = function() {
+  if (typeof this.localContentExists === "undefined") {
+    var content = localStorage[this.cedarId];
+    this.localContentExists = false;
+    if (typeof content !== "undefined") {
+      var json = JSON.parse(content);
+      if (typeof json.id !== "undefined") {
+        this.localContentExists = true;
+      }
+    }
+  }
+  return this.localContentExists;
+}
+
 /**
  * parse the json for content and set this object's content
  *
  * @param <json>
  */
-Cedar.ContentEntry.prototype.setContent = function(json) {
-  if (typeof json === 'undefined') return;
-  if (json.code == 'UNKNOWN_ID'){
-    this.content = '&nbsp;'; // if an element is new, fill with blank space to allow edit box to display
-  }
-  else if (typeof json.settings.content !== 'undefined') {
-    this.content = json.settings.content;
+Cedar.ContentEntry.prototype.setContent = function(data) {
+  if (typeof data === 'undefined') return;
+  if (typeof data === 'string') {
+    data = JSON.parse(data);
   }
-  else {
+  if (data.code == 'UNKNOWN_ID'){
+    this.content = '';
+  } else if (typeof data.settings.content !== 'undefined') {
+    this.content = data.settings.content;
+  } else {
     this.content = '';
     Cedar.debug('Cedar Error: Unable to parse json');
   }
@@ -410,8 +461,7 @@ Cedar.ContentEntry.prototype.toJSON = function(){
 Cedar.ContentEntry.prototype.fill = function(element) {
   if (typeof element !== 'undefined') {
     $(element).html(this.getContent());
-  }
-  else if (typeof this.$el !== 'undefined') {
+  } else if (typeof this.$el !== 'undefined') {
     this.$el.html(this.getContent());
   }
 }
@@ -419,13 +469,10 @@ Cedar.ContentEntry.prototype.fill = function(element) {
  * check store for this object's content
  */
 Cedar.ContentEntry.prototype.retrieve = function() {
-  return Cedar.store.get(this, this.cedarId).then(function(response) {
-    if (typeof response === 'string') {
-      response = JSON.parse(response);
-    }
-    this.setContent(response);
-    return this;
-  }.bind(this));
+ return Cedar.store.get(this, this.cedarId).then(function(response) {
+   this.setContent(response);
+   return this;
+ }.bind(this));
 }
 /**
  * retrive and fill the associated element
@@ -435,6 +482,7 @@ Cedar.ContentEntry.prototype.render = function() {
     this.fill();
   }.bind(this));
 }
+
 /**
  * provides styling for edit box
  */

data/lib/assets/stylesheets/cedar.scss

@@ -4,32 +4,44 @@
 **/
 
 .cedar-cms-editable {
-  position: relative;
+  position: relative !important;
   display: inline-block !important;
-  min-height: 22px;
+  min-width: 22px !important;
+  min-height: 22px !important;
   vertical-align: middle;
-
-  &:before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    border: 1px dotted #F65126 !important;
-    box-sizing: border-box;
-  }
+  font-size: inherit !important;
+  color: inherit !important;
+  background: inherit !important;
+  width: auto !important;
+  height: auto !important;
+  margin: 0 !important;
 }
 
-.cedar-cms-edit-tools {
-  font-family: Arial, sans-serif;
+.cedar-cms-editable:before {
+  content: "";
   position: absolute;
   top: 0;
-  right: -18px;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  border: 1px dotted #F65126 !important;
+  box-sizing: border-box;
+}
+
+.cedar-cms-edit-tools {
+  font-family: Arial, sans-serif !important;
+  position: absolute !important;
+  top: 0 !important;
+  right: -18px !important;
   display: block !important;
   font-size: 10px !important;
   line-height: 1.2 !important;
   text-align: left !important;
+  float: none !important;
+  background: none !important;
+  margin: 0 !important;
+  height: 22px !important;
+  z-index: 9;
 }
 
 .cedar-cms-edit-tools a {
@@ -96,13 +108,15 @@
   position: absolute;
   top: 0;
   right: 0;
+  text-align: left !important;
 }
 .cedar-cms-global-action {
-  display: inline-block;
+  display: inline-block !important;
   color: #F65126 !important;
-  background: #FFF;
-  line-height: 18px;
-  padding: 3px 4px 3px 3px;
+  background: #FFF !important;
+  line-height: 18px !important;
+  padding: 3px 4px 3px 3px !important;
+  text-decoration: none !important;
 }
 .cedar-cms-global-action * {
   vertical-align: top;

data/lib/cedar/version.rb

@@ -1,3 +1,3 @@
 module Cedar
-  VERSION = "0.2.2.pre"
+  VERSION = "0.2.3.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cedar
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre
+  version: 0.2.3.pre
 platform: ruby
 authors:
 - Jed Murdock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler