Package updates
Thomas Hounsell
parent
f1d67e4215
commit
548f51e29d
|
|
@ -39,14 +39,14 @@
|
|||
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="MongoDB.Bson, Version=2.4.1.18, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MongoDB.Bson.2.4.1\lib\net45\MongoDB.Bson.dll</HintPath>
|
||||
<Reference Include="MongoDB.Bson, Version=2.4.2.27, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MongoDB.Bson.2.4.2\lib\net45\MongoDB.Bson.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="MongoDB.Driver, Version=2.4.1.18, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MongoDB.Driver.2.4.1\lib\net45\MongoDB.Driver.dll</HintPath>
|
||||
<Reference Include="MongoDB.Driver, Version=2.4.2.27, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MongoDB.Driver.2.4.2\lib\net45\MongoDB.Driver.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="MongoDB.Driver.Core, Version=2.4.1.18, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MongoDB.Driver.Core.2.4.1\lib\net45\MongoDB.Driver.Core.dll</HintPath>
|
||||
<Reference Include="MongoDB.Driver.Core, Version=2.4.2.27, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MongoDB.Driver.Core.2.4.2\lib\net45\MongoDB.Driver.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<packages>
|
||||
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net462" />
|
||||
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net462" />
|
||||
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net462" />
|
||||
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net462" />
|
||||
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
|
||||
<package id="MongoDB.Bson" version="2.4.1" targetFramework="net462" />
|
||||
<package id="MongoDB.Driver" version="2.4.1" targetFramework="net462" />
|
||||
<package id="MongoDB.Driver.Core" version="2.4.1" targetFramework="net462" />
|
||||
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
|
||||
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net462" />
|
||||
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net462" />
|
||||
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net462" />
|
||||
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net462" />
|
||||
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
|
||||
<package id="MongoDB.Bson" version="2.4.2" targetFramework="net462" />
|
||||
<package id="MongoDB.Driver" version="2.4.2" targetFramework="net462" />
|
||||
<package id="MongoDB.Driver.Core" version="2.4.2" targetFramework="net462" />
|
||||
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
|
||||
</packages>
|
||||
|
|
@ -345,8 +345,6 @@
|
|||
<Content Include="Scripts\trumbowyg\plugins\base64\trumbowyg.base64.min.js" />
|
||||
<Content Include="Scripts\trumbowyg\plugins\cleanpaste\trumbowyg.cleanpaste.js" />
|
||||
<Content Include="Scripts\trumbowyg\plugins\cleanpaste\trumbowyg.cleanpaste.min.js" />
|
||||
<Content Include="Scripts\trumbowyg\plugins\colors\Gulpfile.js" />
|
||||
<Content Include="Scripts\trumbowyg\plugins\colors\Gulpfile.min.js" />
|
||||
<Content Include="Scripts\trumbowyg\plugins\colors\trumbowyg.colors.js" />
|
||||
<Content Include="Scripts\trumbowyg\plugins\colors\trumbowyg.colors.min.js" />
|
||||
<Content Include="Scripts\trumbowyg\plugins\colors\ui\trumbowyg.colors.css" />
|
||||
|
|
@ -415,9 +413,9 @@
|
|||
<Content Include="settings.config">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Views\front\AddBulk.cshtml" />
|
||||
<Content Include="Scripts\trumbowyg\plugins\colors\ui\sass\trumbowyg.colors.scss" />
|
||||
<Content Include="Scripts\trumbowyg\ui\sass\trumbowyg.scss" />
|
||||
<Content Include="Views\front\AddBulk.cshtml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@
|
|||
* Author : Teppo Koivula (teppokoivula)
|
||||
* Github : https://github.com/teppokoivula
|
||||
*/
|
||||
jQuery.trumbowyg.langs.fi={viewHTML:"Näytä HTML",formatting:"Muotoilu",p:"Kappale",blockquote:"Lainaus",code:"Koodi",header:"Otsikko",bold:"Lihavointi",italic:"Kursivointi",strikethrough:"Yliviivaus",underline:"Allevivaus",strong:"Vahvennus",em:"Painotus",del:"Poistettu",unorderedList:"Numeroimaton lista",orderedList:"Numeroitu lista",insertImage:"Lisää kuva",insertVideo:"Lisää video",link:"Linkki",createLink:"Luo linkki",unlink:"Poista linkki",justifyLeft:"Asemoi vasemmalle",justifyCenter:"Keskitä",justifyRight:"Asemoi oikealle",justifyFull:"Tasaa",horizontalRule:"Vaakaviiva",fullscreen:"Kokoruutu",close:"Sulje",submit:"Lähetä",reset:"Palauta",required:"Pakollinen",description:"Kuvaus",title:"Otsikko",text:"Teksti"};
|
||||
jQuery.trumbowyg.langs.fi={viewHTML:"Näytä HTML",undo:"Kumoa",redo:"Tee uudelleen",formatting:"Muotoilu",p:"Kappale",blockquote:"Lainaus",code:"Koodi",header:"Otsikko",bold:"Lihavointi",italic:"Kursivointi",strikethrough:"Yliviivaus",underline:"Allevivaus",strong:"Vahvennus",em:"Painotus",del:"Poistettu",unorderedList:"Luettelo",orderedList:"Numeroitu luettelo",insertImage:"Lisää kuva",insertVideo:"Lisää video",link:"Linkki",createLink:"Luo linkki",unlink:"Poista linkki",justifyLeft:"Tasaa vasemmalle",justifyCenter:"Keskitä",justifyRight:"Tasaa oikealle",justifyFull:"Tasaa",horizontalRule:"Vaakaviiva",fullscreen:"Kokoruutu",close:"Sulje",submit:"Lisää",reset:"Palauta",required:"Pakollinen",description:"Kuvaus",title:"Otsikko",text:"Teksti"};
|
||||
|
|
@ -7,4 +7,4 @@
|
|||
* Twitter : @AlexandreDemode
|
||||
* Website : alex-d.fr
|
||||
*/
|
||||
jQuery.trumbowyg.langs.fr={viewHTML:"Voir le HTML",undo:"Annuler",redo:"Refaire",formatting:"Format",p:"Paragraphe",blockquote:"Citation",code:"Code",header:"Titre",bold:"Gras",italic:"Italique",strikethrough:"Rayé",underline:"Souligné",strong:"Fort",em:"Emphase",del:"Supprimé",superscript:"Exposant",subscript:"Indice",unorderedList:"Liste à puces",orderedList:"Liste ordonnée",insertImage:"Insérer une image",insertVideo:"Insérer une video",link:"Lien",createLink:"Insérer un lien",unlink:"Supprimer le lien",justifyLeft:"Aligner à gauche",justifyCenter:"Centrer",justifyRight:"Aligner à droite",justifyFull:"Justifier",horizontalRule:"Insérer un séparateur horizontal",fullscreen:"Plein écran",close:"Fermer",submit:"Valider",reset:"Annuler",required:"Obligatoire",description:"Description",title:"Titre",text:"Texte",target:"Cible"};
|
||||
jQuery.trumbowyg.langs.fr={viewHTML:"Voir le HTML",undo:"Annuler",redo:"Refaire",formatting:"Format",p:"Paragraphe",blockquote:"Citation",code:"Code",header:"Titre",bold:"Gras",italic:"Italique",strikethrough:"Rayé",underline:"Souligné",strong:"Fort",em:"Emphase",del:"Supprimé",superscript:"Exposant",subscript:"Indice",unorderedList:"Liste à puces",orderedList:"Liste ordonnée",insertImage:"Insérer une image",insertVideo:"Insérer une video",link:"Lien",createLink:"Insérer un lien",unlink:"Supprimer le lien",justifyLeft:"Aligner à gauche",justifyCenter:"Centrer",justifyRight:"Aligner à droite",justifyFull:"Justifier",horizontalRule:"Insérer un séparateur horizontal",removeformat:"Supprimer formatage",fullscreen:"Plein écran",close:"Fermer",submit:"Valider",reset:"Annuler",required:"Obligatoire",description:"Description",title:"Titre",text:"Texte",target:"Cible"};
|
||||
|
|
@ -5,4 +5,4 @@
|
|||
* ===========================================================
|
||||
* Author : Yuri Lya
|
||||
*/
|
||||
jQuery.trumbowyg.langs.ru={viewHTML:"Посмотреть HTML",formatting:"Форматирование",p:"Обычный",blockquote:"Цитата",code:"Код",header:"Заголовок",bold:"Полужирный",italic:"Курсив",strikethrough:"Зачеркнутый",underline:"Подчеркнутый",strong:"Полужирный",em:"Курсив",del:"Зачеркнутый",unorderedList:"Обычный список",orderedList:"Нумерованный список",insertImage:"Вставить изображение",insertVideo:"Вставить видео",link:"Ссылка",createLink:"Вставить ссылку",unlink:"Удалить ссылку",justifyLeft:"По левому краю",justifyCenter:"По центру",justifyRight:"По правому краю",justifyFull:"По ширине",horizontalRule:"Горизонтальная линия",fullscreen:"Во весь экран",close:"Закрыть",submit:"Вставить",reset:"Отменить",required:"Обязательное",description:"Описание",title:"Подсказка",text:"Текст"};
|
||||
jQuery.trumbowyg.langs.ru={viewHTML:"Посмотреть HTML",undo:"Отменить",redo:"Повторить",formatting:"Форматирование",p:"Обычный",blockquote:"Цитата",code:"Код",header:"Заголовок",bold:"Полужирный",italic:"Курсив",strikethrough:"Зачеркнутый",underline:"Подчеркнутый",strong:"Полужирный",em:"Курсив",del:"Зачеркнутый",superscript:"Надстрочный",subscript:"Подстрочный",unorderedList:"Обычный список",orderedList:"Нумерованный список",insertImage:"Вставить изображение",insertVideo:"Вставить видео",link:"Ссылка",createLink:"Вставить ссылку",unlink:"Удалить ссылку",justifyLeft:"По левому краю",justifyCenter:"По центру",justifyRight:"По правому краю",justifyFull:"По ширине",horizontalRule:"Горизонтальная линия",removeformat:"Очистить форматирование",fullscreen:"Во весь экран",close:"Закрыть",submit:"Вставить",reset:"Отменить",required:"Обязательное",description:"Описание",title:"Подсказка",text:"Текст"};
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
// jshint node:true
|
||||
'use strict';
|
||||
|
||||
var gulp = require('gulp'),
|
||||
$ = require('gulp-load-plugins')();
|
||||
|
||||
var paths = {
|
||||
mainStyle: 'ui/sass/trumbowyg.colors.scss',
|
||||
styles: {
|
||||
sass: 'ui/sass',
|
||||
includePaths: ['ui/sass', '../../src/ui/sass/mixins']
|
||||
}
|
||||
};
|
||||
|
||||
var pkg = require('../../package.json');
|
||||
var banner = ['/**',
|
||||
' * <%= pkg.title %> v<%= pkg.version %> - <%= pkg.description %>',
|
||||
' * <%= description %>',
|
||||
' * ------------------------',
|
||||
' * @link <%= pkg.homepage %>',
|
||||
' * @license <%= pkg.license %>',
|
||||
' * @author <%= pkg.author.name %>',
|
||||
' * Twitter : @AlexandreDemode',
|
||||
' * Website : <%= pkg.author.url.replace("http://", "") %>',
|
||||
' */',
|
||||
'\n'].join('\n');
|
||||
var bannerLight = ['/** <%= pkg.title %> v<%= pkg.version %> - <%= pkg.description %>',
|
||||
' - <%= pkg.homepage.replace("http://", "") %>',
|
||||
' - License <%= pkg.license %>',
|
||||
' - Author : <%= pkg.author.name %>',
|
||||
' / <%= pkg.author.url.replace("http://", "") %>',
|
||||
' */',
|
||||
'\n'].join('');
|
||||
|
||||
|
||||
|
||||
gulp.task('styles', function () {
|
||||
return gulp.src(paths.mainStyle)
|
||||
.pipe($.sass({
|
||||
sass: paths.styles.sass,
|
||||
includePaths: paths.styles.includePaths
|
||||
}))
|
||||
.pipe($.autoprefixer(['last 1 version', '> 1%', 'ff >= 20', 'ie >= 8', 'opera >= 12', 'Android >= 2.2'], {cascade: true}))
|
||||
.pipe($.header(banner, {pkg: pkg, description: 'Colors plugin stylesheet for Trumbowyg editor'}))
|
||||
.pipe(gulp.dest('../../dist/plugins/colors/ui/'))
|
||||
.pipe($.size({title: 'trumbowyg.colors.css'}))
|
||||
.pipe($.rename({suffix: '.min'})) // génère une version minimifié
|
||||
.pipe($.minifyCss())
|
||||
.pipe($.header(bannerLight, {pkg: pkg}))
|
||||
.pipe(gulp.dest('../../dist/plugins/colors/ui/'))
|
||||
.pipe($.size({title: 'trumbowyg.colors.min.css'}));
|
||||
});
|
||||
|
||||
|
||||
gulp.task('sass-dist', function () {
|
||||
return gulp.src('ui/sass/**/*.scss')
|
||||
.pipe($.header(banner, {pkg: pkg, description: 'Colors plugin stylesheet for Trumbowyg editor'}))
|
||||
.pipe(gulp.dest('../../dist/plugins/colors/ui/sass/'));
|
||||
});
|
||||
|
||||
|
||||
gulp.task('watch', function () {
|
||||
gulp.watch(paths.mainStyle, ['styles']);
|
||||
});
|
||||
|
||||
|
||||
gulp.task('build', ['styles', 'sass-dist']);
|
||||
|
||||
gulp.task('default', ['build', 'watch']);
|
||||
|
|
@ -1 +0,0 @@
|
|||
"use strict";var gulp=require("gulp"),$=require("gulp-load-plugins")(),paths={mainStyle:"ui/sass/trumbowyg.colors.scss",styles:{sass:"ui/sass",includePaths:["ui/sass","../../src/ui/sass/mixins"]}},pkg=require("../../package.json"),banner=["/**"," * <%= pkg.title %> v<%= pkg.version %> - <%= pkg.description %>"," * <%= description %>"," * ------------------------"," * @link <%= pkg.homepage %>"," * @license <%= pkg.license %>"," * @author <%= pkg.author.name %>"," * Twitter : @AlexandreDemode",' * Website : <%= pkg.author.url.replace("http://", "") %>'," */","\n"].join("\n"),bannerLight=["/** <%= pkg.title %> v<%= pkg.version %> - <%= pkg.description %>",' - <%= pkg.homepage.replace("http://", "") %>'," - License <%= pkg.license %>"," - Author : <%= pkg.author.name %>",' / <%= pkg.author.url.replace("http://", "") %>'," */","\n"].join("");gulp.task("styles",function(){return gulp.src(paths.mainStyle).pipe($.sass({sass:paths.styles.sass,includePaths:paths.styles.includePaths})).pipe($.autoprefixer(["last 1 version","> 1%","ff >= 20","ie >= 8","opera >= 12","Android >= 2.2"],{cascade:!0})).pipe($.header(banner,{pkg:pkg,description:"Colors plugin stylesheet for Trumbowyg editor"})).pipe(gulp.dest("../../dist/plugins/colors/ui/")).pipe($.size({title:"trumbowyg.colors.css"})).pipe($.rename({suffix:".min"})).pipe($.minifyCss()).pipe($.header(bannerLight,{pkg:pkg})).pipe(gulp.dest("../../dist/plugins/colors/ui/")).pipe($.size({title:"trumbowyg.colors.min.css"}))}),gulp.task("sass-dist",function(){return gulp.src("ui/sass/**/*.scss").pipe($.header(banner,{pkg:pkg,description:"Colors plugin stylesheet for Trumbowyg editor"})).pipe(gulp.dest("../../dist/plugins/colors/ui/sass/"))}),gulp.task("watch",function(){gulp.watch(paths.mainStyle,["styles"])}),gulp.task("build",["styles","sass-dist"]),gulp.task("default",["build","watch"]);
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/* ===========================================================
|
||||
* trumbowyg.colors.js v1.1
|
||||
* trumbowyg.colors.js v1.2
|
||||
* Colors picker plugin for Trumbowyg
|
||||
* http://alex-d.github.com/Trumbowyg
|
||||
* ===========================================================
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
plugins: {
|
||||
color: {
|
||||
init: function (trumbowyg) {
|
||||
trumbowyg.o.plugins.colors = $.extend(true, {}, defaultOptions, trumbowyg.o.plugins.colors || {});
|
||||
trumbowyg.o.plugins.colors = trumbowyg.o.plugins.colors || defaultOptions;
|
||||
var foreColorBtnDef = {
|
||||
dropdown: buildDropdown('foreColor', trumbowyg)
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
!function(o){"use strict";function r(o){return("0"+parseInt(o).toString(16)).slice(-2)}function e(o){return-1===o.search("rgb")?o.replace("#",""):"rgba(0, 0, 0, 0)"===o?"transparent":(o=o.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))?\)$/),r(o[1])+r(o[2])+r(o[3]))}function f(o,r){var f=[];if(!o.style)return f;if(""!==o.style.backgroundColor){var c=e(o.style.backgroundColor);r.o.plugins.colors.colorList.indexOf(c)>=0?f.push("backColor"+c):f.push("backColorFree")}var a;return""!==o.style.color?a=e(o.style.color):o.hasAttribute("color")&&(a=e(o.getAttribute("color"))),a&&(r.o.plugins.colors.colorList.indexOf(a)>=0?f.push("foreColor"+a):f.push("foreColorFree")),f}function c(r,e){var f=[];o.each(e.o.plugins.colors.colorList,function(o,c){var a=r+c,d={fn:r,forceCss:!0,param:"#"+c,style:"background-color: #"+c+";"};e.addBtnDef(a,d),f.push(a)});var c=r+"Remove",a={fn:"removeFormat",param:r,style:"background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAG0lEQVQIW2NkQAAfEJMRmwBYhoGBYQtMBYoAADziAp0jtJTgAAAAAElFTkSuQmCC);"};e.addBtnDef(c,a),f.push(c);var d=r+"Free",t={fn:function(){e.openModalInsert(e.lang[r],{color:{label:r,value:"#FFFFFF"}},function(o){return e.execCmd(r,o.color),!0})},text:"#",style:"text-indent: 0;line-height: 20px;padding: 0 5px;"};return e.addBtnDef(d,t),f.push(d),f}o.extend(!0,o.trumbowyg,{langs:{cs:{foreColor:"Barva textu",backColor:"Barva pozadí"},en:{foreColor:"Text color",backColor:"Background color"},fr:{foreColor:"Couleur du texte",backColor:"Couleur de fond"},sk:{foreColor:"Farba textu",backColor:"Farba pozadia"},zh_cn:{foreColor:"文字颜色",backColor:"背景颜色"}}});var a={colorList:["ffffff","000000","eeece1","1f497d","4f81bd","c0504d","9bbb59","8064a2","4bacc6","f79646","ffff00","f2f2f2","7f7f7f","ddd9c3","c6d9f0","dbe5f1","f2dcdb","ebf1dd","e5e0ec","dbeef3","fdeada","fff2ca","d8d8d8","595959","c4bd97","8db3e2","b8cce4","e5b9b7","d7e3bc","ccc1d9","b7dde8","fbd5b5","ffe694","bfbfbf","3f3f3f","938953","548dd4","95b3d7","d99694","c3d69b","b2a2c7","b7dde8","fac08f","f2c314","a5a5a5","262626","494429","17365d","366092","953734","76923c","5f497a","92cddc","e36c09","c09100","7f7f7f","0c0c0c","1d1b10","0f243e","244061","632423","4f6128","3f3151","31859b","974806","7f6000"]};o.extend(!0,o.trumbowyg,{plugins:{color:{init:function(r){r.o.plugins.colors=o.extend(!0,{},a,r.o.plugins.colors||{});var e={dropdown:c("foreColor",r)},f={dropdown:c("backColor",r)};r.addBtnDef("foreColor",e),r.addBtnDef("backColor",f)},tagHandler:f}}})}(jQuery);
|
||||
!function(o){"use strict";function r(o){return("0"+parseInt(o).toString(16)).slice(-2)}function e(o){return-1===o.search("rgb")?o.replace("#",""):"rgba(0, 0, 0, 0)"===o?"transparent":(o=o.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))?\)$/),r(o[1])+r(o[2])+r(o[3]))}function f(o,r){var f=[];if(!o.style)return f;if(""!==o.style.backgroundColor){var c=e(o.style.backgroundColor);r.o.plugins.colors.colorList.indexOf(c)>=0?f.push("backColor"+c):f.push("backColorFree")}var a;return""!==o.style.color?a=e(o.style.color):o.hasAttribute("color")&&(a=e(o.getAttribute("color"))),a&&(r.o.plugins.colors.colorList.indexOf(a)>=0?f.push("foreColor"+a):f.push("foreColorFree")),f}function c(r,e){var f=[];o.each(e.o.plugins.colors.colorList,function(o,c){var a=r+c,d={fn:r,forceCss:!0,param:"#"+c,style:"background-color: #"+c+";"};e.addBtnDef(a,d),f.push(a)});var c=r+"Remove",a={fn:"removeFormat",param:r,style:"background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAG0lEQVQIW2NkQAAfEJMRmwBYhoGBYQtMBYoAADziAp0jtJTgAAAAAElFTkSuQmCC);"};e.addBtnDef(c,a),f.push(c);var d=r+"Free",t={fn:function(){e.openModalInsert(e.lang[r],{color:{label:r,value:"#FFFFFF"}},function(o){return e.execCmd(r,o.color),!0})},text:"#",style:"text-indent: 0;line-height: 20px;padding: 0 5px;"};return e.addBtnDef(d,t),f.push(d),f}o.extend(!0,o.trumbowyg,{langs:{cs:{foreColor:"Barva textu",backColor:"Barva pozadí"},en:{foreColor:"Text color",backColor:"Background color"},fr:{foreColor:"Couleur du texte",backColor:"Couleur de fond"},sk:{foreColor:"Farba textu",backColor:"Farba pozadia"},zh_cn:{foreColor:"文字颜色",backColor:"背景颜色"}}});var a={colorList:["ffffff","000000","eeece1","1f497d","4f81bd","c0504d","9bbb59","8064a2","4bacc6","f79646","ffff00","f2f2f2","7f7f7f","ddd9c3","c6d9f0","dbe5f1","f2dcdb","ebf1dd","e5e0ec","dbeef3","fdeada","fff2ca","d8d8d8","595959","c4bd97","8db3e2","b8cce4","e5b9b7","d7e3bc","ccc1d9","b7dde8","fbd5b5","ffe694","bfbfbf","3f3f3f","938953","548dd4","95b3d7","d99694","c3d69b","b2a2c7","b7dde8","fac08f","f2c314","a5a5a5","262626","494429","17365d","366092","953734","76923c","5f497a","92cddc","e36c09","c09100","7f7f7f","0c0c0c","1d1b10","0f243e","244061","632423","4f6128","3f3151","31859b","974806","7f6000"]};o.extend(!0,o.trumbowyg,{plugins:{color:{init:function(o){o.o.plugins.colors=o.o.plugins.colors||a;var r={dropdown:c("foreColor",o)},e={dropdown:c("backColor",o)};o.addBtnDef("foreColor",r),o.addBtnDef("backColor",e)},tagHandler:f}}})}(jQuery);
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Trumbowyg v2.4.2 - A lightweight WYSIWYG editor
|
||||
* Trumbowyg v2.5.0 - A lightweight WYSIWYG editor
|
||||
* Colors plugin stylesheet for Trumbowyg editor
|
||||
* ------------------------
|
||||
* @link http://alex-d.github.io/Trumbowyg
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Trumbowyg v2.4.2 - A lightweight WYSIWYG editor
|
||||
* Trumbowyg v2.5.0 - A lightweight WYSIWYG editor
|
||||
* Colors plugin stylesheet for Trumbowyg editor
|
||||
* ------------------------
|
||||
* @link http://alex-d.github.io/Trumbowyg
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
/** Trumbowyg v2.4.2 - A lightweight WYSIWYG editor - alex-d.github.io/Trumbowyg - License MIT - Author : Alexandre Demode (Alex-D) / alex-d.fr */
|
||||
/** Trumbowyg v2.5.0 - A lightweight WYSIWYG editor - alex-d.github.io/Trumbowyg - License MIT - Author : Alexandre Demode (Alex-D) / alex-d.fr */
|
||||
.trumbowyg-dropdown-backColor,.trumbowyg-dropdown-foreColor{width:276px;padding:7px 5px}.trumbowyg-dropdown-backColor svg,.trumbowyg-dropdown-foreColor svg{display:none!important}.trumbowyg-dropdown-backColor button,.trumbowyg-dropdown-foreColor button{display:block;position:relative;float:left;text-indent:-9999px;height:20px;width:20px;border:1px solid #333;padding:0;margin:2px}.trumbowyg-dropdown-backColor button:focus::after,.trumbowyg-dropdown-backColor button:hover::after,.trumbowyg-dropdown-foreColor button:focus::after,.trumbowyg-dropdown-foreColor button:hover::after{content:" ";display:block;position:absolute;top:-5px;left:-5px;height:27px;width:27px;background:inherit;border:1px solid #FFF;box-shadow:#000 0 0 2px;z-index:10}
|
||||
|
|
@ -17,13 +17,13 @@
|
|||
var defaultOptions = {
|
||||
serverPath: './src/plugins/upload/trumbowyg.upload.php',
|
||||
fileFieldName: 'fileToUpload',
|
||||
data: [],
|
||||
headers: {},
|
||||
xhrFields: {},
|
||||
urlPropertyName: 'file',
|
||||
statusPropertyName: 'success',
|
||||
success: undefined,
|
||||
error: undefined
|
||||
data: [], // Additional data for ajax [{name: 'key', value: 'value'}]
|
||||
headers: {}, // Additional headers
|
||||
xhrFields: {}, // Additional fields
|
||||
urlPropertyName: 'file', // How to get url from the json response (for instance 'url' for {url: ....})
|
||||
statusPropertyName: 'success', // How to get status from the json response
|
||||
success: undefined, // Success callback: function (data, trumbowyg, $modal, values) {}
|
||||
error: undefined // Error callback: function () {}
|
||||
};
|
||||
|
||||
function getDeep(object, propertyParts) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Trumbowyg v2.4.2 - A lightweight WYSIWYG editor
|
||||
* Trumbowyg v2.5.0 - A lightweight WYSIWYG editor
|
||||
* Trumbowyg core file
|
||||
* ------------------------
|
||||
* @link http://alex-d.github.io/Trumbowyg
|
||||
|
|
@ -70,7 +70,9 @@ jQuery.trumbowyg = {
|
|||
plugins: {},
|
||||
|
||||
// SVG Path globally
|
||||
svgPath: null
|
||||
svgPath: null,
|
||||
|
||||
hideButtonTexts: null
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -159,6 +161,8 @@ jQuery.trumbowyg = {
|
|||
t.lang = $.trumbowyg.langs.en;
|
||||
}
|
||||
|
||||
t.hideButtonTexts = $.trumbowyg.hideButtonTexts != null ? $.trumbowyg.hideButtonTexts : options.hideButtonTexts;
|
||||
|
||||
// SVG path
|
||||
var svgPathOption = $.trumbowyg.svgPath != null ? $.trumbowyg.svgPath : options.svgPath;
|
||||
t.hasSvg = svgPathOption !== false;
|
||||
|
|
@ -555,12 +559,13 @@ jQuery.trumbowyg = {
|
|||
|
||||
var ctrl = false,
|
||||
composition = false,
|
||||
isCrazyMobile = !!navigator.userAgent.match(/Android/i),
|
||||
debounceButtonPaneStatus;
|
||||
|
||||
t.$ed
|
||||
.on('dblclick', 'img', t.o.imgDblClickHandler)
|
||||
.on('keydown', function (e) {
|
||||
composition = t.o.useComposition && (e.which === 229);
|
||||
composition = t.o.useComposition && !isCrazyMobile && (e.which === 229);
|
||||
|
||||
if (e.ctrlKey) {
|
||||
ctrl = true;
|
||||
|
|
@ -573,16 +578,27 @@ jQuery.trumbowyg = {
|
|||
}
|
||||
}
|
||||
})
|
||||
.on('keyup input', function (e) {
|
||||
if (e.which >= 37 && e.which <= 40) {
|
||||
.on('input', function(e) {
|
||||
t.semanticCode(false, true);
|
||||
t.$c.trigger('tbwchange');
|
||||
})
|
||||
.on('keyup', function (e) {
|
||||
var kc = e.which;
|
||||
if (isCrazyMobile && (!kc || kc === 229)) {
|
||||
kc = this.textContent.charCodeAt(this.textContent.length - 1);
|
||||
}
|
||||
|
||||
if (kc >= 37 && kc <= 40) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (e.ctrlKey && (e.which === 89 || e.which === 90)) {
|
||||
if (e.ctrlKey && (kc === 89 || kc === 90)) {
|
||||
t.$c.trigger('tbwchange');
|
||||
} else if (!ctrl && e.which !== 17 && !composition) {
|
||||
t.semanticCode(false, e.which === 13);
|
||||
} else if (!ctrl && kc !== 17 && !composition) {
|
||||
t.semanticCode(false, kc === 13);
|
||||
t.$c.trigger('tbwchange');
|
||||
} else if (typeof e.which === 'undefined' && composition) {
|
||||
t.semanticCode(false, false, true);
|
||||
}
|
||||
|
||||
setTimeout(function () {
|
||||
|
|
@ -708,7 +724,9 @@ jQuery.trumbowyg = {
|
|||
$btn = $('<button/>', {
|
||||
type: 'button',
|
||||
class: prefix + btnName + '-button ' + (btn.class || '') + (!hasIcon ? ' ' + prefix + 'textual-button' : ''),
|
||||
html: t.hasSvg && hasIcon ? '<svg><use xlink:href="' + t.svgPath + '#' + prefix + (btn.ico || btnName).replace(/([A-Z]+)/g, '-$1').toLowerCase() + '"/></svg>' : (btn.text || btn.title || t.lang[btnName] || btnName),
|
||||
html: t.hasSvg && hasIcon ?
|
||||
'<svg><use xlink:href="' + t.svgPath + '#' + prefix + (btn.ico || btnName).replace(/([A-Z]+)/g, '-$1').toLowerCase() + '"/></svg>' :
|
||||
t.hideButtonTexts ? '' : (btn.text || btn.title || t.lang[btnName] || btnName),
|
||||
title: (btn.title || btn.text || textDef) + ((btn.key) ? ' (Ctrl + ' + btn.key + ')' : ''),
|
||||
tabindex: -1,
|
||||
mousedown: function () {
|
||||
|
|
@ -974,10 +992,12 @@ jQuery.trumbowyg = {
|
|||
|
||||
$(window).trigger('scroll');
|
||||
|
||||
$('body', d).on('mousedown.'+t.eventNamespace, function () {
|
||||
$('.' + prefix + 'dropdown', d).hide();
|
||||
$('.' + prefix + 'active', d).removeClass(prefix + 'active');
|
||||
$('body', d).off('mousedown.'+t.eventNamespace);
|
||||
$('body', d).on('mousedown.'+t.eventNamespace, function (e) {
|
||||
if (!$dropdown.is(e.target)) {
|
||||
$('.' + prefix + 'dropdown', d).hide();
|
||||
$('.' + prefix + 'active', d).removeClass(prefix + 'active');
|
||||
$('body', d).off('mousedown.'+t.eventNamespace);
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
@ -1017,7 +1037,8 @@ jQuery.trumbowyg = {
|
|||
// Analyse and update to semantic code
|
||||
// @param force : force to sync code from textarea
|
||||
// @param full : wrap text nodes in <p>
|
||||
semanticCode: function (force, full) {
|
||||
// @param keepRange : leave selection range as it is
|
||||
semanticCode: function (force, full, keepRange) {
|
||||
var t = this;
|
||||
t.saveRange();
|
||||
t.syncCode(force);
|
||||
|
|
@ -1066,7 +1087,9 @@ jQuery.trumbowyg = {
|
|||
t.$ed.find('p:empty').remove();
|
||||
}
|
||||
|
||||
t.restoreRange();
|
||||
if (!keepRange) {
|
||||
t.restoreRange();
|
||||
}
|
||||
|
||||
t.syncTextarea();
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Trumbowyg v2.4.2 - A lightweight WYSIWYG editor
|
||||
* Trumbowyg v2.5.0 - A lightweight WYSIWYG editor
|
||||
* Default stylesheet for Trumbowyg editor
|
||||
* ------------------------
|
||||
* @link http://alex-d.github.io/Trumbowyg
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Trumbowyg v2.4.2 - A lightweight WYSIWYG editor
|
||||
* Trumbowyg v2.5.0 - A lightweight WYSIWYG editor
|
||||
* Default stylesheet for Trumbowyg editor
|
||||
* ------------------------
|
||||
* @link http://alex-d.github.io/Trumbowyg
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -6,11 +6,11 @@
|
|||
"devDependencies": {
|
||||
"gulp": "^3.9.1",
|
||||
"gulp-sass": "^3.1.0",
|
||||
"gulp-clean-css": "^2.3.2",
|
||||
"gulp-sourcemaps": "^2.4.0",
|
||||
"gulp-clean-css": "^3.0.3",
|
||||
"gulp-sourcemaps": "^2.4.1",
|
||||
"gulp-typescript": "^3.1.4",
|
||||
"typescript": "^2.1.5",
|
||||
"gulp-uglify": "^2.0.0",
|
||||
"gulp-uglify": "^2.0.1",
|
||||
"gulp-autoprefixer": "^3.1.1"
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue