esp-ckeditor 0.1.1 → 0.1.2

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

@@ -85,7 +85,7 @@ CKEDITOR.on('instanceReady', function(ev) {
 
   ev.editor.dataProcessor.writer.indentationChars = "  ";
 
-  var tags = new Array('h1','h2','h3','h4','h5','h6', 'td', 'li', 'caption', 'th');
+  var tags = new Array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'th', 'td', 'li', 'caption', 'th');
   for (var tag in tags) {
     ev.editor.dataProcessor.writer.setRules(tags[tag], {
       indent : false,
@@ -96,7 +96,7 @@ CKEDITOR.on('instanceReady', function(ev) {
     });
   };
 
-  tags = ['p', 'div', 'blockquote', 'pre', 'audio','video', 'source'];
+  tags = ['div', 'blockquote', 'pre', 'audio','video'];
 
   for (var tag in tags) {
     ev.editor.dataProcessor.writer.setRules(tags[tag], {
@@ -108,6 +108,14 @@ CKEDITOR.on('instanceReady', function(ev) {
     });
   };
 
+  ev.editor.dataProcessor.writer.setRules('source', {
+    indent : true,
+    breakBeforeOpen : false,
+    breakAfterOpen : true,
+    breakBeforeClose : false,
+    breakAfterClose : false
+  });
+
   ev.editor.dataProcessor.htmlFilter.addRules({
     elements:
     {

data/app/assets/javascripts/esp-ckeditor/plugins/esp_video/dialogs/esp_video.js

@@ -1 +1 @@
-CKEDITOR.dialog.add("esp_video",function(f){var a=f.lang.esp_video;function e(j,l){var k=this.getValue();if(!k&&this.id=="id"){k=h()}j.setAttribute(this.id,k);if(!k){return}switch(this.id){case"poster":l.backgroundImage="url("+k+")";break;case"width":l.width=k+"px";break;case"height":l.height=k+"px";break}}function b(n,o,k){var j=this.id.match(/(\w+)(\d)/),p=j[1],m=parseInt(j[2],10);var l=k[m]||(k[m]={});l[p]=this.getValue()}function g(j){if(j){this.setValue(j.getAttribute(this.id))}else{if(this.id=="id"){this.setValue(h())}}}function c(n,k){var j=this.id.match(/(\w+)(\d)/),o=j[1],m=parseInt(j[2],10);var l=k[m];if(!l){return}this.setValue(l[o])}function h(){var j=new Date();return"video"+j.getFullYear()+j.getMonth()+j.getDate()+j.getHours()+j.getMinutes()+j.getSeconds()}var d=function(){var j=this.previewImage;j.removeListener("load",d);j.removeListener("error",i);j.removeListener("abort",i);this.setValueOf("info","width",j.$.width);this.setValueOf("info","height",j.$.height)};var i=function(){var j=this.previewImage;j.removeListener("load",d);j.removeListener("error",i);j.removeListener("abort",i)};return{title:a.dialogTitle,minWidth:400,minHeight:140,onShow:function(){this.fakeImage=this.videoNode=null;this.previewImage=f.document.createElement("img");var j=this.getSelectedElement();if(j&&j.data("cke-real-element-type")&&j.data("cke-real-element-type")=="video"){this.fakeImage=j;var l=f.restoreRealElement(j),k=[];k.push({src:l.getAttribute("src")});this.videoNode=l;this.setupContent(l,k)}else{this.setupContent(null,[])}},onOk:function(){var o=null;if(!this.fakeImage){o=CKEDITOR.dom.element.createFromHtml("<cke:video></cke:video>",f.document);o.setAttributes({controls:"controls",src:this.getValueOf("info","src0")})}else{o=this.videoNode}var q={},m=[];this.commitContent(o,q,m);var k="",j="",n=a.linkTemplate||"",l=a.fallbackTemplate||"";j=n.replace("%src%",this.getValueOf("info","src0")).replace("%type%",this.getValueOf("info","src0").split("/").pop());o.setHtml(k+l.replace("%links%",j));var p=f.createFakeElement(o,"cke_video","video",false);p.setStyles(q);if(this.fakeImage){p.replace(this.fakeImage);f.getSelection().selectElement(p)}else{f.insertElement(p)}},onHide:function(){if(this.previewImage){this.previewImage.removeListener("load",d);this.previewImage.removeListener("error",i);this.previewImage.removeListener("abort",i);this.previewImage.remove();this.previewImage=null}},contents:[{id:"info",elements:[{type:"hbox",widths:["320px","80px"],children:[{type:"text",id:"src0",label:a.sourceVideo,commit:b,setup:c},{type:"button",id:"browse",hidden:"true",style:"display:inline-block;margin-top:10px;",filebrowser:{action:"Browse",target:"info:src0",url:f.config.filebrowserVideoBrowseUrl||f.config.filebrowserBrowseUrl},label:f.lang.esp_video.browseServer}]},{type:"hbox",widths:["50%","50%"],children:[{type:"text",id:"width",label:f.lang.common.width,"default":512,validate:CKEDITOR.dialog.validate.notEmpty(a.widthRequired),commit:e,setup:g},{type:"text",id:"height",label:f.lang.common.height,"default":410,validate:CKEDITOR.dialog.validate.notEmpty(a.heightRequired),commit:e,setup:g}]},{type:"hbox",widths:["320px","80px"],children:[{type:"text",id:"poster",label:a.poster,commit:e,setup:g,onChange:function(){var j=this.getDialog(),l=this.getValue();if(l.length>0){j=this.getDialog();var k=j.previewImage;k.on("load",d,j);k.on("error",i,j);k.on("abort",i,j);k.setAttribute("src",l)}}},{type:"button",id:"browse",hidden:"true",style:"display:inline-block;margin-top:10px;",filebrowser:{action:"Browse",target:"info:poster",url:f.config.filebrowserImageBrowseUrl||f.config.filebrowserBrowseUrl},label:f.lang.esp_video.browseServer}]}]}]}});
+CKEDITOR.dialog.add("esp_video",function(f){var a=f.lang.esp_video;function e(j,l){var k=this.getValue();if(!k&&this.id=="id"){k=h()}j.setAttribute(this.id,k);if(!k){return}switch(this.id){case"poster":l.backgroundImage="url("+k+")";break;case"width":l.width=k+"px";break;case"height":l.height=k+"px";break}}function b(n,o,k){var j=this.id.match(/(\w+)(\d)/),p=j[1],m=parseInt(j[2],10);var l=k[m]||(k[m]={});l[p]=this.getValue()}function g(j){if(j){this.setValue(j.getAttribute(this.id))}else{if(this.id=="id"){this.setValue(h())}}}function c(n,k){var j=this.id.match(/(\w+)(\d)/),o=j[1],m=parseInt(j[2],10);var l=k[m];if(!l){return}this.setValue(l[o])}function h(){var j=new Date();return"video"+j.getFullYear()+j.getMonth()+j.getDate()+j.getHours()+j.getMinutes()+j.getSeconds()}var d=function(){var j=this.previewImage;j.removeListener("load",d);j.removeListener("error",i);j.removeListener("abort",i);this.setValueOf("info","width",j.$.width);this.setValueOf("info","height",j.$.height)};var i=function(){var j=this.previewImage;j.removeListener("load",d);j.removeListener("error",i);j.removeListener("abort",i)};return{title:a.dialogTitle,minWidth:450,minHeight:235,onShow:function(){this.fakeImage=this.videoNode=null;this.previewImage=f.document.createElement("img");var j=this.getSelectedElement();if(j&&j.data("cke-real-element-type")&&j.data("cke-real-element-type")=="video"){this.fakeImage=j;var p=f.restoreRealElement(j),l=[],o=p.getElementsByTag("source","");if(o.count()==0){o=p.getElementsByTag("source","cke")}for(var k=0,n=o.count();k<n;k++){var m=o.getItem(k);l.push({src:m.getAttribute("src"),type:m.getAttribute("type")})}this.videoNode=p;this.setupContent(p,l)}else{this.setupContent(null,[])}},onOk:function(){var o=null;if(!this.fakeImage){o=CKEDITOR.dom.element.createFromHtml("<cke:video></cke:video>",f.document);o.setAttributes({controls:"controls"})}else{o=this.videoNode}var m={},n=[];this.commitContent(o,m,n);var l="",s="",q=a.linkTemplate||"",k=a.fallbackTemplate||"";for(var p=0;p<n.length;p++){var j=n[p];if(!j||!j.src){continue}l+='<cke:source src="'+j.src+'" type="'+j.type+'" />';s+=q.replace("%src%",j.src).replace("%type%",j.type)}o.setHtml(l+k.replace("%links%",s));var r=f.createFakeElement(o,"cke_video","video",false);r.setStyles(m);if(this.fakeImage){r.replace(this.fakeImage);f.getSelection().selectElement(r)}else{f.insertElement(r)}},onHide:function(){if(this.previewImage){this.previewImage.removeListener("load",d);this.previewImage.removeListener("error",i);this.previewImage.removeListener("abort",i);this.previewImage.remove();this.previewImage=null}},contents:[{id:"info",elements:[{type:"hbox",widths:["","100px"],children:[{type:"text",id:"poster",label:a.poster,commit:e,setup:g,onChange:function(){var j=this.getDialog(),l=this.getValue();if(l.length>0){j=this.getDialog();var k=j.previewImage;k.on("load",d,j);k.on("error",i,j);k.on("abort",i,j);k.setAttribute("src",l)}}},{type:"button",id:"browse",hidden:"true",style:"display:inline-block;margin-top:10px;",filebrowser:{action:"Browse",target:"info:poster",url:f.config.filebrowserImageBrowseUrl||f.config.filebrowserBrowseUrl},label:f.lang.common.browseServer}]},{type:"hbox",widths:["50%","50%"],children:[{type:"text",id:"width",label:f.lang.common.width,"default":512,validate:CKEDITOR.dialog.validate.notEmpty(a.widthRequired),commit:e,setup:g},{type:"text",id:"height",label:f.lang.common.height,"default":410,validate:CKEDITOR.dialog.validate.notEmpty(a.heightRequired),commit:e,setup:g}]},{type:"hbox",widths:["","55px","100px"],children:[{type:"text",id:"src0",label:a.sourceVideo,commit:b,setup:c},{id:"type0",label:a.sourceType,type:"select","default":"video/mp4",items:[["MP4","video/mp4"],["WebM","video/webm"],["OGV","video/ogg"]],commit:b,setup:c},{type:"button",id:"browse",hidden:"true",style:"display:inline-block;margin-top:10px;",filebrowser:{action:"Browse",target:"info:src0",url:f.config.filebrowserVideoBrowseUrl||f.config.filebrowserBrowseUrl},label:f.lang.common.browseServer}]},{type:"hbox",widths:["","55px","100px"],children:[{type:"text",id:"src1",label:a.sourceVideo,commit:b,setup:c},{id:"type1",label:a.sourceType,type:"select","default":"video/webm",items:[["MP4","video/mp4"],["WebM","video/webm"],["OGV","video/ogg"]],commit:b,setup:c},{type:"button",id:"browse",hidden:"true",style:"display:inline-block;margin-top:10px;",filebrowser:{action:"Browse",target:"info:src1",url:f.config.filebrowserVideoBrowseUrl||f.config.filebrowserBrowseUrl},label:f.lang.common.browseServer}]},{type:"hbox",widths:["","55px","100px"],children:[{type:"text",id:"src2",label:a.sourceVideo,commit:b,setup:c},{id:"type2",label:a.sourceType,type:"select","default":"video/ogg",items:[["MP4","video/mp4"],["WebM","video/webm"],["OGV","video/ogg"]],commit:b,setup:c},{type:"button",id:"browse",hidden:"true",style:"display:inline-block;margin-top:10px;",filebrowser:{action:"Browse",target:"info:src2",url:f.config.filebrowserVideoBrowseUrl||f.config.filebrowserBrowseUrl},label:f.lang.common.browseServer}]}]}]}});

data/app/assets/javascripts/esp-ckeditor/plugins/esp_video/lang/en.js

@@ -1 +1 @@
-CKEDITOR.plugins.setLang("esp_video","en",{esp_video:{toolbar:"Video",dialogTitle:"Video properties",browseServer:"Browse",fakeObject:"Video",properties:"Edit video",widthRequired:"Width field cannot be empty",heightRequired:"Height field cannot be empty",poster:"Poster image",sourceVideo:"Source video",sourceType:"Video type",linkTemplate:'<a href="%src%">%type%</a> ',fallbackTemplate:"Your browser doesn't support video. Please download the file: %links%"}});
+CKEDITOR.plugins.setLang("esp_video","en",{esp_video:{toolbar:"Video",dialogTitle:"Video properties",browseServer:"Browse",fakeObject:"Video",properties:"Edit video",widthRequired:"Width field cannot be empty",heightRequired:"Height field cannot be empty",poster:"Poster image",sourceVideo:"Source video",sourceType:"Type",linkTemplate:'<a href="%src%">%type%</a> ',fallbackTemplate:"Your browser doesn't support video. Please download the file: %links%"}});

data/app/assets/javascripts/esp-ckeditor/plugins/esp_video/lang/ru.js

@@ -1 +1 @@
-CKEDITOR.plugins.setLang("esp_video","ru",{esp_video:{toolbar:"Видео",dialogTitle:"Параметры видео",browseServer:"Выбор",fakeObject:"Видео",properties:"Редактировать видео",widthRequired:'Поле "ширина" не может быть пустым',heightRequired:'Поле "высота" не может быть пустым',poster:"Скриншот",sourceVideo:"Источник",sourceType:"Тип источника",linkTemplate:'<a href="%src%">%type%</a> ',fallbackTemplate:"Ваш браузер не поддерживает тэг video. Вы можете скачать файл: %links%"}});
+CKEDITOR.plugins.setLang("esp_video","ru",{esp_video:{toolbar:"Видео",dialogTitle:"Параметры видео",browseServer:"Выбор",fakeObject:"Видео",properties:"Редактировать видео",widthRequired:'Поле "ширина" не может быть пустым',heightRequired:'Поле "высота" не может быть пустым',poster:"Скриншот",sourceVideo:"Источник",sourceType:"Тип",linkTemplate:'<a href="%src%">%type%</a> ',fallbackTemplate:"Ваш браузер не поддерживает тэг video. Вы можете скачать файл: %links%"}});

data/app/assets/javascripts/esp-ckeditor/plugins/esp_video/lang/uk.js

@@ -1 +1 @@
-CKEDITOR.plugins.setLang("esp_video","uk",{esp_video:{toolbar:"Відео",dialogTitle:"Параметри відео",browseServer:"Вибір",fakeObject:"Відео",properties:"Редагувати відео",widthRequired:'Поле "ширина" не може бути порожнім',heightRequired:'Поле "висота" не може бути порожнім',poster:"Скріншот",sourceVideo:"Джерело",sourceType:"Тип джерела",linkTemplate:'<a href="%src%">%type%</a> ',fallbackTemplate:"Ваш браузер не підтримує тег video. Ви можете завантажити файл: %links%"}});
+CKEDITOR.plugins.setLang("esp_video","uk",{esp_video:{toolbar:"Відео",dialogTitle:"Параметри відео",browseServer:"Вибір",fakeObject:"Відео",properties:"Редагувати відео",widthRequired:'Поле "ширина" не може бути порожнім',heightRequired:'Поле "висота" не може бути порожнім',poster:"Скріншот",sourceVideo:"Джерело",sourceType:"Тип",linkTemplate:'<a href="%src%">%type%</a> ',fallbackTemplate:"Ваш браузер не підтримує тег video. Ви можете завантажити файл: %links%"}});

data/app/assets/javascripts/esp-ckeditor/plugins/esp_video/plugin.js

@@ -1 +1 @@
-CKEDITOR.plugins.add("esp_video",{lang:["en","ru","uk"],init:function(a){var b=a.lang.esp_video;if(typeof a.element.data=="undefined"){alert('The "video" plugin requires CKEditor 3.5 or newer');return}CKEDITOR.dialog.add("esp_video",this.path+"dialogs/esp_video.js");a.addCommand("esp_video",new CKEDITOR.dialogCommand("esp_video"));a.ui.addButton("Esp_video",{label:b.toolbar,command:"esp_video",icon:this.path+"images/esp_video.png"});a.addCss("img.cke_video{background-image: url("+CKEDITOR.getUrl(this.path+"images/placeholder.png")+");background-position: center center;background-repeat: no-repeat;background-color:gray;border: 1px solid #a9a9a9;width: 80px;height: 80px;}");if(a.addMenuItems){a.addMenuItems({video:{label:b.properties,command:"video",group:"flash"}})}a.on("doubleclick",function(c){var d=c.data.element;if(d.is("img")&&d.data("cke-real-element-type")=="video"){c.data.dialog="video"}});if(a.contextMenu){a.contextMenu.addListener(function(c,d){if(c&&c.is("img")&&!c.isReadOnly()&&c.data("cke-real-element-type")=="video"){return{video:CKEDITOR.TRISTATE_OFF}}})}CKEDITOR.dtd.$empty["cke:source"]=1;CKEDITOR.dtd.$empty.source=1;a.lang.fakeobjects.video=b.fakeObject},afterInit:function(c){var a=c.dataProcessor,e=a&&a.htmlFilter,d=a&&a.dataFilter;var b=c.plugins.googleMapsHandler;d.addRules({elements:{$:function(h){if(h.name=="video"){h.name="cke:video";var g=c.createFakeParserElement(h,"cke_video","video",false),j=g.attributes.style||"";var i=h.attributes.width,f=h.attributes.height,k=h.attributes.poster;if(typeof i!="undefined"){j=g.attributes.style=j+"width:"+CKEDITOR.tools.cssLength(i)+";"}if(typeof f!="undefined"){j=g.attributes.style=j+"height:"+CKEDITOR.tools.cssLength(f)+";"}if(k){j=g.attributes.style=j+"background-image:url("+k+");"}return g}}}});e.addRules({elements:{$:function(h){if(h.name=="img"){var j=h.attributes.mapnumber;if(j){var f,i=c.plugins.googleMapsHandler,g=i.getMap(j);if(g&&g.generatedType>1){i.CreatedMapsNames.push(g.number);f=new CKEDITOR.htmlParser.cdata(g.BuildScript());h.parent.children.push(f)}delete h.attributes.mapnumber}}return h}}})}});
+CKEDITOR.plugins.add("esp_video",{lang:["en","ru","uk"],init:function(a){var b=a.lang.esp_video;if(typeof a.element.data=="undefined"){alert('The "video" plugin requires CKEditor 3.5 or newer');return}CKEDITOR.dialog.add("esp_video",this.path+"dialogs/esp_video.js");a.addCommand("esp_video",new CKEDITOR.dialogCommand("esp_video"));a.ui.addButton("Esp_video",{label:b.toolbar,command:"esp_video",icon:this.path+"images/esp_video.png"});a.addCss("img.cke_video{background-image: url("+CKEDITOR.getUrl(this.path+"images/placeholder.png")+");background-position: center center;background-repeat: no-repeat;background-color:gray;border: 1px solid #a9a9a9;width: 80px;height: 80px;}");if(a.addMenuItems){a.addMenuItems({video:{label:b.properties,command:"video",group:"flash"}})}a.on("doubleclick",function(c){var d=c.data.element;if(d.is("img")&&d.data("cke-real-element-type")=="video"){c.data.dialog="video"}});if(a.contextMenu){a.contextMenu.addListener(function(c,d){if(c&&c.is("img")&&!c.isReadOnly()&&c.data("cke-real-element-type")=="video"){return{video:CKEDITOR.TRISTATE_OFF}}})}CKEDITOR.dtd.$empty["cke:source"]=1;CKEDITOR.dtd.$empty.source=1;a.lang.fakeobjects.video=b.fakeObject},afterInit:function(b){var a=b.dataProcessor,d=a&&a.htmlFilter,c=a&&a.dataFilter;c.addRules({elements:{$:function(g){if(g.name=="video"){g.name="cke:video";var f=b.createFakeParserElement(g,"cke_video","video",false),i=f.attributes.style||"";var h=g.attributes.width,e=g.attributes.height,j=g.attributes.poster;if(typeof h!="undefined"){i=f.attributes.style=i+"width:"+CKEDITOR.tools.cssLength(h)+";"}if(typeof e!="undefined"){i=f.attributes.style=i+"height:"+CKEDITOR.tools.cssLength(e)+";"}if(j){i=f.attributes.style=i+"background-image:url("+j+");"}return f}}}})}});

data/lib/esp-ckeditor/version.rb

@@ -1,3 +1,3 @@
 module EspCkeditor
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-ckeditor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &19467920 !ruby/object:Gem::Requirement
+  requirement: &16170640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19467920
+  version_requirements: *16170640
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19466900 !ruby/object:Gem::Requirement
+  requirement: &16169760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19466900
+  version_requirements: *16169760
 - !ruby/object:Gem::Dependency
   name: juicer
-  requirement: &19465980 !ruby/object:Gem::Requirement
+  requirement: &16168960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19465980
+  version_requirements: *16168960
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &19465300 !ruby/object:Gem::Requirement
+  requirement: &16168060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19465300
+  version_requirements: *16168060
 description: EspCkeditor.
 email:
 - mail@openteam.ru
@@ -421,7 +421,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1930510557994677401
+      hash: 1713675996699259440
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -430,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1930510557994677401
+      hash: 1713675996699259440
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10