trusty-cms 1.1.26 → 1.1.27

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDIzZGRiNDdmM2Q2ODUwNTdkMWVlMDllNmJiNjFkYzIwMjYzN2JhYg==
+    ZmNhM2FkMGQ1YjM4MjI4OGI4NjI3NmRhYWM0YWU1ZWY5NGY1OTgxMg==
   data.tar.gz: !binary |-
-    NmM1MjI0Y2JhMzcxZWFkZDI3MjcyMDg4MWU1NzUxNmM1OGI0NjQ5MQ==
+    OGRhYTM0ZGIyNDYxZGRiOTE0YjI1MzY1ZjVmMWZlMGY3Nzg3ODIwMA==
 SHA512:
   metadata.gz: !binary |-
-    MzNmZDFjZDZlYzkxNjI1MDViNTFkMGZjNzZjNzJjMjM0M2Y2MWI3MDQzMmZj
-    M2JhYzNjMGFlNzZhODVhNWE4MzhhMWFiYjRhZWUyOTY3ZDc0NjUwNjM1NzA5
-    NmE5NTZmOTY4MGEzMWIwZTA1ODc3ZGYwYmIyY2Q3MmIyMDIwZGU=
+    NDAxOWM3MDZjZmExYWM1MDU1ODEyNjEyODk1MTYwYmQzOGZmNTE4NjEzZjNm
+    ZjI1YzljZGIzYzA0ZGZkMGE5MDEyYTIyMjhiOWM0MzNiMjY4ODI0MzVkY2I3
+    OWIwMDU1MDZjOGZjZTk4ODU2YmU3NjQwZTRiZjgxYmFmMjJmYTc=
   data.tar.gz: !binary |-
-    NDk3MjRkMmIzYTg4NzVmODAxNGVlNTg3YTVlYzA0MDc3OTc4NjVkZTBkZjIx
-    NmE1MDM1YzY0NWVkZDM0YTdjYWE0YTUxZGEwZjk0NzFiMjlhOTgwYjYzYmE5
-    MzkzODFlMjY0MzUzNmU2MzkxN2M1ZWYyMWI3NGY0YmZiODhlYmM=
+    MGVlMDZlM2QxYjlmMWIxZmI4ZmMyNmRhZDIyNjc5M2QwMzY1Yzc4MGVmYmZh
+    NDc5ZWI1OGU5YjA0YjRkMDEwZDZlOTlmMmFhMjQ0YWY2MDNjNTQyZjQwMWY1
+    NTM3MzJjOWYzMjRjNGIwNTBmYmQ5MmQ2ODgwNzliZDFmNWVmMmY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (1.1.25)
+    trusty-cms (1.1.26)
       RedCloth (~> 4.2)
       acts_as_tree (~> 0.1.1)
       bundler (~> 1.7)

data/app/assets/javascripts/admin.js

@@ -13,6 +13,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require 'admin/jquery-ui'
+//= require 'admin/jquery.cookie'
 //= require 'admin/jquery.validate.min'
 //= require 'admin/jquery.treetable'
 //= require_tree './admin/validations'

data/app/assets/javascripts/admin/jquery.cookie.js

@@ -0,0 +1,117 @@
+/*!
+ * jQuery Cookie Plugin v1.4.1
+ * https://github.com/carhartl/jquery-cookie
+ *
+ * Copyright 2006, 2014 Klaus Hartl
+ * Released under the MIT license
+ */
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // CommonJS
+    factory(require('jquery'));
+  } else {
+    // Browser globals
+    factory(jQuery);
+  }
+}(function ($) {
+
+  var pluses = /\+/g;
+
+  function encode(s) {
+    return config.raw ? s : encodeURIComponent(s);
+  }
+
+  function decode(s) {
+    return config.raw ? s : decodeURIComponent(s);
+  }
+
+  function stringifyCookieValue(value) {
+    return encode(config.json ? JSON.stringify(value) : String(value));
+  }
+
+  function parseCookieValue(s) {
+    if (s.indexOf('"') === 0) {
+      // This is a quoted cookie as according to RFC2068, unescape...
+      s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+    }
+
+    try {
+      // Replace server-side written pluses with spaces.
+      // If we can't decode the cookie, ignore it, it's unusable.
+      // If we can't parse the cookie, ignore it, it's unusable.
+      s = decodeURIComponent(s.replace(pluses, ' '));
+      return config.json ? JSON.parse(s) : s;
+    } catch(e) {}
+  }
+
+  function read(s, converter) {
+    var value = config.raw ? s : parseCookieValue(s);
+    return $.isFunction(converter) ? converter(value) : value;
+  }
+
+  var config = $.cookie = function (key, value, options) {
+
+    // Write
+
+    if (arguments.length > 1 && !$.isFunction(value)) {
+      options = $.extend({}, config.defaults, options);
+
+      if (typeof options.expires === 'number') {
+        var days = options.expires, t = options.expires = new Date();
+        t.setTime(+t + days * 864e+5);
+      }
+
+      return (document.cookie = [
+        encode(key), '=', stringifyCookieValue(value),
+        options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
+        options.path    ? '; path=' + options.path : '',
+        options.domain  ? '; domain=' + options.domain : '',
+        options.secure  ? '; secure' : ''
+      ].join(''));
+    }
+
+    // Read
+
+    var result = key ? undefined : {};
+
+    // To prevent the for loop in the first place assign an empty array
+    // in case there are no cookies at all. Also prevents odd result when
+    // calling $.cookie().
+    var cookies = document.cookie ? document.cookie.split('; ') : [];
+
+    for (var i = 0, l = cookies.length; i < l; i++) {
+      var parts = cookies[i].split('=');
+      var name = decode(parts.shift());
+      var cookie = parts.join('=');
+
+      if (key && key === name) {
+        // If second argument (value) is a function it's a converter...
+        result = read(cookie, value);
+        break;
+      }
+
+      // Prevent storing a cookie that we couldn't decode.
+      if (!key && (cookie = read(cookie)) !== undefined) {
+        result[name] = cookie;
+      }
+    }
+
+    return result;
+  };
+
+  config.defaults = {};
+
+  $.removeCookie = function (key, options) {
+    if ($.cookie(key) === undefined) {
+      return false;
+    }
+
+    // Must not alter options, thus extending a fresh object...
+    $.cookie(key, '', $.extend({}, options, { expires: -1 }));
+    return !$.cookie(key);
+  };
+
+}));

data/app/assets/javascripts/ckeditor/config.js

@@ -3,8 +3,19 @@ CKEDITOR.editorConfig = function( config ) {
   config.removeFormatTags = "";
   config.protectedSource.push(/<r:([\S]+).*<\/r:\1>/g);
   config.protectedSource.push(/<r:[^>\/]*\/>/g);
+
   config.forcePasteAsPlainText = true;
   // if you want to remove clipboard, you have to remove all of these:
   // clipboard, pastetext, pastefromword
   config.removePlugins = "save, newpage, preview, print, templates, forms, flash, smiley, language, pagebreak, iframe, bidi";
+
+  var startupMode = $.cookie('ckeditor.startupMode');
+  if (startupMode == 'source' || startupMode == 'wysiwyg' ) {
+    config.startupMode = startupMode;
+  }
+
+  this.on('mode', function(){
+    $.cookie('ckeditor.startupMode', this.mode);
+  })
+
 };

data/lib/trusty_cms.rb

@@ -5,7 +5,7 @@ unless defined? TrustyCms::Version
     module Version
       Major = '1'
       Minor = '1'
-      Tiny  = '26'
+      Tiny  = '27'
       Patch = nil # set to nil for normal release
 
       class << self

data/lib/trusty_cms/extension_migrator.rb

@@ -8,7 +8,7 @@ module TrustyCms
       end
 
       def migrate_extensions
-        TrustyCms::Application.config.enabled_extensions.each do |ext|
+        TrustyCms::Application.config.extensions.each do |ext|
           to_migrate = Extension.descendants.detect{|descendant| descendant.name == "#{ext.to_s.camelize}Extension" }
           to_migrate.migrator.migrate
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 1.1.26
+  version: 1.1.27
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -411,6 +411,7 @@ files:
 - app/assets/javascripts/admin/datecheck.js
 - app/assets/javascripts/admin/dropdown.js
 - app/assets/javascripts/admin/jquery-ui.js
+- app/assets/javascripts/admin/jquery.cookie.js
 - app/assets/javascripts/admin/jquery.treetable.js
 - app/assets/javascripts/admin/jquery.validate.min.js
 - app/assets/javascripts/admin/modernizr.js