Skip to content

Commit

Permalink
Update to 2.6.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanneculai committed May 25, 2017
1 parent 8f78a81 commit 7933b5d
Show file tree
Hide file tree
Showing 94 changed files with 1,371 additions and 132 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "froala/wysiwyg-cake2",
"version": "2.6.0",
"version": "2.6.1",
"description": "A beautiful jQuery WYSIWYG text editor based on HTML5 technology. Cross browser, with mobile support, high performance and Retina Ready modern design.",
"type": "cakephp-plugin",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion webroot/css/froala_editor.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/froala_style.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/char_counter.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/code_view.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/colors.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/draggable.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down
2 changes: 1 addition & 1 deletion webroot/css/plugins/emoticons.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down
2 changes: 1 addition & 1 deletion webroot/css/plugins/file.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/fullscreen.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down
2 changes: 1 addition & 1 deletion webroot/css/plugins/help.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/image.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/image_manager.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/line_breaker.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down
2 changes: 1 addition & 1 deletion webroot/css/plugins/quick_insert.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/special_characters.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/spell_checker.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/
Expand Down
2 changes: 1 addition & 1 deletion webroot/css/plugins/spell_checker.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/table.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/video.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions webroot/css/themes/dark.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions webroot/css/themes/gray.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions webroot/css/themes/red.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions webroot/css/themes/royal.min.css

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions webroot/js/froala_editor.min.js

Large diffs are not rendered by default.

30 changes: 29 additions & 1 deletion webroot/js/languages/ar.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/

(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
} else if (typeof module === 'object' && module.exports) {
// Node/CommonJS
module.exports = function( root, jQuery ) {
if ( jQuery === undefined ) {
// require('jQuery') returns a factory that requires window to
// build a jQuery instance, we normalize how we use modules
// that require this pattern but the window provided is a noop
// if it's defined (how jquery works)
if ( typeof window !== 'undefined' ) {
jQuery = require('jquery');
}
else {
jQuery = require('jquery')(root);
}
}
return factory(jQuery);
};
} else {
// Browser globals
factory(window.jQuery);
}
}(function ($) {
/**
* Arabic
*/
Expand Down Expand Up @@ -231,3 +257,5 @@ $.FE.LANGUAGE['ar'] = {
},
direction: "rtl"
};

}));
30 changes: 29 additions & 1 deletion webroot/js/languages/bs.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/

(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
} else if (typeof module === 'object' && module.exports) {
// Node/CommonJS
module.exports = function( root, jQuery ) {
if ( jQuery === undefined ) {
// require('jQuery') returns a factory that requires window to
// build a jQuery instance, we normalize how we use modules
// that require this pattern but the window provided is a noop
// if it's defined (how jquery works)
if ( typeof window !== 'undefined' ) {
jQuery = require('jquery');
}
else {
jQuery = require('jquery')(root);
}
}
return factory(jQuery);
};
} else {
// Browser globals
factory(window.jQuery);
}
}(function ($) {
/**
* Bosnian
*/
Expand Down Expand Up @@ -231,3 +257,5 @@ $.FE.LANGUAGE['bs'] = {
},
direction: "ltr"
};

}));
30 changes: 29 additions & 1 deletion webroot/js/languages/cs.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/

(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
} else if (typeof module === 'object' && module.exports) {
// Node/CommonJS
module.exports = function( root, jQuery ) {
if ( jQuery === undefined ) {
// require('jQuery') returns a factory that requires window to
// build a jQuery instance, we normalize how we use modules
// that require this pattern but the window provided is a noop
// if it's defined (how jquery works)
if ( typeof window !== 'undefined' ) {
jQuery = require('jquery');
}
else {
jQuery = require('jquery')(root);
}
}
return factory(jQuery);
};
} else {
// Browser globals
factory(window.jQuery);
}
}(function ($) {
/**
* Czech
*/
Expand Down Expand Up @@ -231,3 +257,5 @@ $.FE.LANGUAGE['cs'] = {
},
direction: "ltr"
};

}));
30 changes: 29 additions & 1 deletion webroot/js/languages/da.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/

(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
} else if (typeof module === 'object' && module.exports) {
// Node/CommonJS
module.exports = function( root, jQuery ) {
if ( jQuery === undefined ) {
// require('jQuery') returns a factory that requires window to
// build a jQuery instance, we normalize how we use modules
// that require this pattern but the window provided is a noop
// if it's defined (how jquery works)
if ( typeof window !== 'undefined' ) {
jQuery = require('jquery');
}
else {
jQuery = require('jquery')(root);
}
}
return factory(jQuery);
};
} else {
// Browser globals
factory(window.jQuery);
}
}(function ($) {
/**
* Danish
*/
Expand Down Expand Up @@ -231,3 +257,5 @@ $.FE.LANGUAGE['da'] = {
},
direction: "ltr"
};

}));
30 changes: 29 additions & 1 deletion webroot/js/languages/de.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/

(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
} else if (typeof module === 'object' && module.exports) {
// Node/CommonJS
module.exports = function( root, jQuery ) {
if ( jQuery === undefined ) {
// require('jQuery') returns a factory that requires window to
// build a jQuery instance, we normalize how we use modules
// that require this pattern but the window provided is a noop
// if it's defined (how jquery works)
if ( typeof window !== 'undefined' ) {
jQuery = require('jquery');
}
else {
jQuery = require('jquery')(root);
}
}
return factory(jQuery);
};
} else {
// Browser globals
factory(window.jQuery);
}
}(function ($) {
/**
* German
*/
Expand Down Expand Up @@ -231,3 +257,5 @@ $.FE.LANGUAGE['de'] = {
},
direction: "ltr"
};

}));
30 changes: 29 additions & 1 deletion webroot/js/languages/en_ca.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
/*!
* froala_editor v2.6.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.6.1 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms/
* Copyright 2014-2017 Froala Labs
*/

(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
} else if (typeof module === 'object' && module.exports) {
// Node/CommonJS
module.exports = function( root, jQuery ) {
if ( jQuery === undefined ) {
// require('jQuery') returns a factory that requires window to
// build a jQuery instance, we normalize how we use modules
// that require this pattern but the window provided is a noop
// if it's defined (how jquery works)
if ( typeof window !== 'undefined' ) {
jQuery = require('jquery');
}
else {
jQuery = require('jquery')(root);
}
}
return factory(jQuery);
};
} else {
// Browser globals
factory(window.jQuery);
}
}(function ($) {
/**
* English spoken in Canada
*/
Expand Down Expand Up @@ -175,3 +201,5 @@ $.FE.LANGUAGE['en_ca'] = {
},
direction: "ltr"
};

}));
Loading

0 comments on commit 7933b5d

Please sign in to comment.