modeljs 0.0.1 → 0.0.2

data/app/assets/javascripts/attribute/h1.js

@@ -0,0 +1,61 @@
+
+Model.Attribute.H1 = Model.Attribute.extend({
+    
+  show_reminder: true,
+  width: '100%',
+	
+  view: function()
+  {
+    var html = false;
+    if (typeof(this.value) == 'string')
+      html = this.value && this.value.length > 0 ? this.value : this.empty_text;
+    else if (typeof(this.value) == 'number')
+      html = this.value != null ? this.value : this.empty_text;
+    else
+      html = this.value;
+    
+  	return $('<h1/>')
+  		.html(html);
+  },
+  
+  form: function()
+  {
+    var this2 = this;
+    var input = $('<input/>')
+  		.attr('type', 'text')
+  		.attr('id', this.base)
+  		.attr('name', this.base)
+  		.css('width', this.width)
+  		.val(this.value);
+  	if (this.show_reminder)
+  		input.keyup(function (){ this2.flash_reminder(); })
+  	if (this.css)
+  	  input.css(this.css);
+  	var form = $('<form/>').append(input);
+  	if (this.show_reminder)
+  	  form.append($('<span/>').attr('id', this.base + '_reminder').css('font-size', '75%'));
+
+  	return form;
+  },
+  
+  flash_reminder: function()
+  {
+    $('#' + this.base + '_reminder')
+      .html(' (Enter to update, Escape to cancel)')
+      .delay(1000)
+      .fadeOut({ done: function() { $(this).empty().show(); }});
+  },
+  
+  post_form_display: function()
+  {
+    // Put the focus at the end of the string
+    $('#' + this.base).focus();
+    val = $('#' + this.base).val();
+    $('#' + this.base).val('');
+    $('#' + this.base).val(val);
+    
+    if (this.show_reminder)
+      this.flash_reminder();   
+  }
+  
+});

data/app/assets/javascripts/{modeljs/attribute → attribute}/image.js

@@ -68,7 +68,7 @@ Model.Attribute.Image = Model.Attribute.extend({
       .append($('<input/>').attr('type', 'submit').val('Update').addClass('update_btn').click(function() { this2.loading('Uploading...');     }))
       .append($('<input/>').attr('type', 'button').val('Cancel').addClass('cancel_btn').click(function() { this2.model.show_attribute(this2); }));
     form.append(controls);
-    form.append($('<span/>').attr('id', attrib.message));
+    form.append($('<span/>').attr('id', this.message));
     return form;
   },
   
@@ -97,7 +97,7 @@ Model.Attribute.Image = Model.Attribute.extend({
 		{
 		  if (resp.attribute)
 		    for (var thing in resp.attribute)
-		      attrib[thing] = resp.attribute[thing];
+		      this[thing] = resp.attribute[thing];
 			this.model.show_attribute(this);
 		}
   }

data/app/assets/javascripts/{modeljs/attribute → attribute}/rich-text.js

@@ -5,7 +5,8 @@ Model.Attribute.RichText = Model.Attribute.extend({
     
   view: function()
   {
-    tinyMCE.execCommand('mceRemoveControl', null, $('#' + this.base));
+    //tinyMCE.execCommand('mceRemoveControl', null, $('#' + this.base));
+    tinyMCE.execCommand('mceRemoveControl', null, this.base);
     var html = this.value && this.value.length > 0 ? this.value : this.empty_text;
 		return $('<div/>')
 			.addClass('model_attribute_container')
@@ -16,7 +17,7 @@ Model.Attribute.RichText = Model.Attribute.extend({
   {
     return $('<form/>')
       .append($('<textarea/>')
-				.addClass('mceEditor')
+				.addClass('tinymce')
 				.attr('id', this.base)
 				.attr('name', this.base)
 				.val(this.value)
@@ -26,14 +27,16 @@ Model.Attribute.RichText = Model.Attribute.extend({
   form_value: function()
   {
     tinyMCE.triggerSave();
-    tinyMCE.execCommand('mceRemoveControl', null, $('#' + this.base));
+    //tinyMCE.execCommand('mceRemoveControl', null, $('#' + this.base));
+    tinyMCE.execCommand('mceRemoveControl', null, this.base);
     return $('#' + this.base).val();
   },
   
   post_form_display: function()
 	{		
 		$('#' + this.base).css('display', 'block');
-		tinyMCE.execCommand('mceAddControl', null, $('#' + this.base));
+		//tinyMCE.execCommand('mceAddControl', null, $('#' + this.base));
+		tinyMCE.execCommand('mceAddControl', null, this.base);
 		$('#' + this.base).focus();
 	}
   

data/app/assets/javascripts/{modeljs/form.js → form.js}

@@ -50,8 +50,12 @@ Model.Form = Class.extend({
       .append($('<table/>').append(tbody))
       .append($('<div/>').attr('id', this.message_div))
       .append($('<p/>')
-        .append($('<input/>').attr('type', 'submit').val('Add ' + m.name).click(function() { m.ajax_add(); }))
-        .append($('<input/>').attr('type', 'button').val('Back').click(function() { window.location = m.listing_url; }))
+        .append($('<input/>').attr('type', 'button').val('Back').click(function() {
+          obj = Model.parse_url(m.listing_url);
+          window.location = obj.url; 
+        }))
+        .append(' ')
+        .append($('<input/>').attr('type', 'submit').val('Add ' + m.name).click(function() { m.ajax_add(); }))        
       );
     return form;
   },
@@ -79,7 +83,10 @@ Model.Form = Class.extend({
       .append($('<table/>').append(tbody))
       .append($('<div/>').attr('id', this.message))
       .append($('<p/>')
-        .append($('<input/>').attr('type', 'button').val('Back').click(function() { window.location = m.listing_url; }))
+        .append($('<input/>').attr('type', 'button').val('Back').click(function() {
+          var obj = Model.parse_url(m.listing_url);
+          window.location = obj.url; 
+        }))
         .append(' ')
         .append($('<input/>').attr('type', 'button').val('Delete ' + m.name).click(function() { m.ajax_delete(); }))
       );

data/app/assets/javascripts/{modeljs/model.js → model.js}

@@ -350,6 +350,11 @@ Model.prototype = {
     attrib.loading();
     this2 = this;
     data = attrib.form_values();
+    
+    for (var thing in data)
+      if (data[thing].constructor.name == 'Array' && data[thing].length == 0)
+        data[thing] = null;
+    
 		obj = Model.parse_url(attrib.update_url ? attrib.update_url : this.update_url, this.id);
     $.ajax({
       url: obj.url,

data/lib/modeljs/version.rb

@@ -1,3 +1,3 @@
 module Modeljs
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modeljs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,25 +66,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/modeljs/attribute/checkbox-multiple.js
-- app/assets/javascripts/modeljs/attribute/checkbox.js
-- app/assets/javascripts/modeljs/attribute/date-time.js
-- app/assets/javascripts/modeljs/attribute/file.js
-- app/assets/javascripts/modeljs/attribute/hidden.js
-- app/assets/javascripts/modeljs/attribute/image.js
-- app/assets/javascripts/modeljs/attribute/password.js
-- app/assets/javascripts/modeljs/attribute/radio.js
-- app/assets/javascripts/modeljs/attribute/rich-text.js
-- app/assets/javascripts/modeljs/attribute/select.js
-- app/assets/javascripts/modeljs/attribute/texarea.js
-- app/assets/javascripts/modeljs/attribute/textjs.js
-- app/assets/javascripts/modeljs/attribute/time.js
-- app/assets/javascripts/modeljs/attribute/video.js
-- app/assets/javascripts/modeljs/attribute.js
-- app/assets/javascripts/modeljs/form/embedded.js
-- app/assets/javascripts/modeljs/form.js
-- app/assets/javascripts/modeljs/model.js
-- app/assets/stylesheets/modeljs/modeljs.css
+- app/assets/images/loading.gif
+- app/assets/images/loading_small.gif
+- app/assets/javascripts/attribute/checkbox-multiple.js
+- app/assets/javascripts/attribute/checkbox.js
+- app/assets/javascripts/attribute/date-time.js
+- app/assets/javascripts/attribute/file.js
+- app/assets/javascripts/attribute/h1.js
+- app/assets/javascripts/attribute/hidden.js
+- app/assets/javascripts/attribute/image.js
+- app/assets/javascripts/attribute/password.js
+- app/assets/javascripts/attribute/radio.js
+- app/assets/javascripts/attribute/rich-text.js
+- app/assets/javascripts/attribute/select.js
+- app/assets/javascripts/attribute/texarea.js
+- app/assets/javascripts/attribute/textjs.js
+- app/assets/javascripts/attribute/time.js
+- app/assets/javascripts/attribute/video.js
+- app/assets/javascripts/attribute.js
+- app/assets/javascripts/form/embedded.js
+- app/assets/javascripts/form.js
+- app/assets/javascripts/model.js
+- app/assets/stylesheets/modeljs.css
 - lib/modeljs/engine.rb
 - lib/modeljs/version.rb
 - lib/modeljs.rb