tb_cms 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 605748db3cf3fd63c1605b3fef7298d1eace65c7
-  data.tar.gz: 7a6d640888624de140b24cfde91098057aeb4b94
+  metadata.gz: cb4c30b7c4e397f11e7a61298f72afc3ca7cc037
+  data.tar.gz: 1d8bb49c58f150e2dcd4974a41069fea937ec51f
 SHA512:
-  metadata.gz: c24b3c28ec9157510f1e3ef94126bc1eb608d64651e32d9344e01f1dca2756e5d7817e8a31986dc0e03dd66d38b8707568170b1c66b3be4afd4ea04488af8d8e
-  data.tar.gz: fffcbe87671ed135abe1489aadfa030ea758dd708d6b5c3312fb64782ccd9f270a9ff4ea3a8d2aec7a62b14c9b74d7037fce3a773adfb2b00c79350ca508358d
+  metadata.gz: 65e1663eaceeb04f7a82f785e84efa71cc5e0f0246c73d114ef6a19c4ca21f710dfd7e5d53ab4474945447ef6dd1877b8c9ef401807c45b91bab0a5e293588f6
+  data.tar.gz: 53ac03e900dd63e3a50e67fef342cb7e0012a0b3c6a652f80c42c2c8e900f9b978eece9e3d48f7f2c170519d565a603d210a3012508d8690c25a46034e343a42

data/app/assets/javascripts/admin/cms/application.js

@@ -3,23 +3,3 @@
 //= require admin/cms/menu_items
 
 spud.admin.cms = {};
-
-$(document).ready(function() {
-	spud.admin.cms.pages.initFormTabs();
-
-	$("#spud_page_layout").bind('change', function() {
-		var $this = $(this);
-		$.get($this.attr("data-source"), { template: $this.val() }, function(data) {
-
-			spud.admin.editor.unload();
-
-			$("#page_partials_form").replaceWith(data);
-			spud.admin.cms.pages.initFormTabs();
-
-			spud.admin.editor.init();
-
-		}, 'text').error(function(jqXHR) {
-			alert("Error: " + jqXHR.responseText);
-		});
-	});
-});

data/app/assets/javascripts/admin/cms/pages.js

@@ -4,7 +4,10 @@ spud.admin.cms.pages = {};
 
 spud.admin.cms.pages = {
   edit: function(){
+    spud.admin.editor.init({selector: '.page-partial-content-editor', width: $("#page_partials_form").width()});
+    spud.admin.cms.pages.initFormTabs();
     $(".btn-preview").on('click', clickedPreviewButton);
+    $("#spud_page_layout").on('change', changedLayoutSelection);
   }
 };
 
@@ -24,11 +27,27 @@ var clickedPreviewButton = function(e){
   }, 200);
 };
 
+var changedLayoutSelection = function(e){
+  var $this = $(this);
+  $.get($this.attr("data-source"), { template: $this.val() }, function(data) {
+
+    spud.admin.editor.unload();
+
+    $("#page_partials_form").replaceWith(data);
+    spud.admin.cms.pages.initFormTabs();
+
+    spud.admin.editor.init({selector: '.page-partial-content-editor', width: $("#page_partials_form").width()});
+
+  }, 'text').error(function(jqXHR) {
+    alert("Error: " + jqXHR.responseText);
+  });
+};
+
 spud.admin.cms.pages.initFormTabs = function(){
   var tabNames = [];
 
   $('.formtabs .formtab').each(function(tabind) {
-    if(tabind === 0) {
+    if(tabind === 0){
       $(this).addClass('active');
     }
     this.id = 'tab-' + tabind;
@@ -36,8 +55,7 @@ spud.admin.cms.pages.initFormTabs = function(){
   });
 
   var tabButtons = $('.formtabs .formtab_buttons').first();
-  for(var x=0;x<tabNames.length;x++)
-  {
+  for(var x = 0; x < tabNames.length; x++){
     var tabButton = $('<li><a href="#tab-' + x + '" data-toggle="tab">' + tabNames[x] + '</a></li>');
     if(x === 0) {
       tabButton.addClass('active');

data/app/views/admin/pages/_form.html.erb

@@ -17,7 +17,7 @@
 	<%= f.fields_for :spud_page_partials do |b| %>
 		<div class="formtab tab-pane">
 			<%= b.hidden_field :name, :class => "tab_name" %>
-			<%= b.text_area :content, :class => "tinymce" %>
+			<%= b.text_area :content, :class => "page-partial-content-editor" %>
 		</div>
 	<% end %>
 </div>

data/app/views/admin/pages/_page_partials_form.html.erb

@@ -8,7 +8,7 @@
 			<% if spud_page_partial.id %>
 				<%= hidden_field_tag "spud_page[spud_page_partials_attributes][#{index}][id]", spud_page_partial.id %>
 			<% end %>
-			<textarea class="tinymce" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
+			<textarea class="page-partial-content-editor" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
 				<%= spud_page_partial.content %>
 			</textarea>
 		</div>

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "1.2.0"
+		VERSION = "1.2.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tb_core