kolo 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e44bc8d358fa041cd3a0da335b79f4a28353ead7
-  data.tar.gz: 967c63d547897ca7361756e5339cf45686a6988d
+  metadata.gz: f11a1fad0faa20c43e1f9d24a3970bdb6025334c
+  data.tar.gz: 167a7cabd6bf309f4da3fb4972af8a05f8846b13
 SHA512:
-  metadata.gz: 2c7c682dd5c4caa88e16c70ee163aee6144a79b9fd1c2654bb69f5eb276c5fa73e5a8ab4794a90a5667fce69499b74bb3652508322d726afb1bb333c1f234390
-  data.tar.gz: cf4346fa63c96bef8498db5021d6ae7c7350c87b32a8d0a86800a818c3a2435e3ab17d9e14711c6a46b362d51296f832282d941916065718c3c030c6bd1f2caa
+  metadata.gz: beb96fe892abad884b1a9d9a9789e8c2a385adf16365b5dca5e899623d8d1dcf75dc0e1d3a1a99db7069fc2cc32fa90d97d44859a2af04cd0631cf0161bbaea3
+  data.tar.gz: 7423844f03e82df8308631fe48a9ed538b9517160f405eb44bbe0b32899ec10ce1b47b22e6d9d106fdef680bc00882c443c7771672444163b93b088a6873c93a

data/lib/assets/javascripts/bindings.js.coffee

@@ -203,23 +203,23 @@ ko.bindingHandlers.fileupload =
 ko.bindingHandlers.wysiwyg = 
   init: (element, valueAccessor, allBindingsAccessor)->
     value = ko.utils.unwrapObservable valueAccessor()
-    $(element).wysiwyg()
+    $(element).attr('id', "ckeditor-#{Math.floor((Math.random() * 100000) + 10000)}") unless $(element).attr('id')?
+    editor = CKEDITOR.replace(element)
+    document.recalc() if document.recalc?
 
-    $(element).bind 'blur keyup paste copy cut mouseup', =>
-      $(element).attr('data-edit-in-progress', 'true')
+    editor.on 'change', (evt)->
+      $(element).attr 'data-edit-in-progress', 'true'
       observable = valueAccessor()
-      newValue = $(element).cleanHtml()
-      observable newValue
-      $(element).attr('data-edit-in-progress', '')
-
-    ko.utils.domNodeDisposal.addDisposeCallback element, =>
-      $(element).wysiwyg('destroy')
+      observable(evt.editor.getData())
+      $(element).attr 'data-edit-in-progress', 'false'
 
   update: (element, valueAccessor)->
     return if $(element).attr('data-edit-in-progress') == 'true'
+    id = $(element).attr('id')
     value = ko.utils.unwrapObservable valueAccessor()
-    $(element).html value
+    CKEDITOR.instances[id].setData value
     ko.bindingHandlers.value.update element, valueAccessor
+    $(element).attr('data-edit-in-progress', 'false')
 
 ko.bindingHandlers.richtext =
   init: (element, valueAccessor, allBindingsAccessor)->

data/lib/kolo/version.rb

@@ -1,3 +1,3 @@
 module Kolo
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/public/js/bindings.js

@@ -316,33 +316,33 @@
 
   ko.bindingHandlers.wysiwyg = {
     init: function(element, valueAccessor, allBindingsAccessor) {
-      var value;
+      var editor, value;
       value = ko.utils.unwrapObservable(valueAccessor());
-      $(element).wysiwyg();
-      $(element).bind('blur keyup paste copy cut mouseup', (function(_this) {
-        return function() {
-          var newValue, observable;
-          $(element).attr('data-edit-in-progress', 'true');
-          observable = valueAccessor();
-          newValue = $(element).cleanHtml();
-          observable(newValue);
-          return $(element).attr('data-edit-in-progress', '');
-        };
-      })(this));
-      return ko.utils.domNodeDisposal.addDisposeCallback(element, (function(_this) {
-        return function() {
-          return $(element).wysiwyg('destroy');
-        };
-      })(this));
+      if ($(element).attr('id') == null) {
+        $(element).attr('id', "ckeditor-" + (Math.floor((Math.random() * 100000) + 10000)));
+      }
+      editor = CKEDITOR.replace(element);
+      if (document.recalc != null) {
+        document.recalc();
+      }
+      return editor.on('change', function(evt) {
+        var observable;
+        $(element).attr('data-edit-in-progress', 'true');
+        observable = valueAccessor();
+        observable(evt.editor.getData());
+        return $(element).attr('data-edit-in-progress', 'false');
+      });
     },
     update: function(element, valueAccessor) {
-      var value;
+      var id, value;
       if ($(element).attr('data-edit-in-progress') === 'true') {
         return;
       }
+      id = $(element).attr('id');
       value = ko.utils.unwrapObservable(valueAccessor());
-      $(element).html(value);
-      return ko.bindingHandlers.value.update(element, valueAccessor);
+      CKEDITOR.instances[id].setData(value);
+      ko.bindingHandlers.value.update(element, valueAccessor);
+      return $(element).attr('data-edit-in-progress', 'false');
     }
   };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kolo
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Rahoul Baruah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler