Skip to content

Commit

Permalink
KEditor v1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ducdhm committed Mar 31, 2016
1 parent f4dd09f commit 4ef560e
Show file tree
Hide file tree
Showing 47 changed files with 241 additions and 22 deletions.
2 changes: 1 addition & 1 deletion dist/css/keditor-1.1.0.css → dist/css/keditor-1.1.1.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* KEditor - Kademi content editor
* @copyright: Kademi (http://kademi.co)
* @author: Kademi (http://kademi.co)
* @version: 1.1.0
* @version: 1.1.1
* @dependencies: $, $.fn.draggable, $.fn.droppable, $.fn.sortable, Bootstrap, FontAwesome (optional)
*/
/* ==================================================================================
Expand Down

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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* KEditor Text Component
* @copyright: Kademi (http://kademi.co)
* @author: Kademi (http://kademi.co)
* @version: 1.1.0
* @version: 1.1.1
* @dependencies: $, $.fn.draggable, $.fn.droppable, $.fn.sortable, Bootstrap, FontAwesome (optional)
*/
/* ==================================================================================
Expand Down

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

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

2 changes: 0 additions & 2 deletions dist/js/keditor-1.1.0.min.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/js/keditor-1.1.0.min.js.map

This file was deleted.

14 changes: 11 additions & 3 deletions dist/js/keditor-1.1.0.js → dist/js/keditor-1.1.1.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* KEditor - Kademi content editor
* @copyright: Kademi (http://kademi.co)
* @author: Kademi (http://kademi.co)
* @version: 1.1.0
* @version: 1.1.1
* @dependencies: $, $.fn.draggable, $.fn.droppable, $.fn.sortable, Bootstrap, FontAwesome (optional)
*
* Configuration:
Expand All @@ -15,8 +15,9 @@
* @option {String} btnDeleteContainerText Text content for delete button of container
* @option {String} btnDeleteComponentText Text content for delete button of component
* @option {String|Function} defaultComponentType Default component type of component. If type of component does not exist in KEditor.components, will be used 'defaultComponentType' as type of this component. If is function, argument is component - jQuery object of component
* @option {Boolean} iframeMode KEditor is created inside an iframe or not
* @option {String} snippetsUrl Url to snippets file
* @option {String} [snippetsListId="keditor-snippets-list"] Id of element which contains snippets. As default, value is "keditor-snippets-list" and KEditor will render snippets sidebar automatically. If you specific other id, only snippets will rendered and put into your element
* @option {String} snippetsListId Id of element which contains snippets. As default, value is "keditor-snippets-list" and KEditor will render snippets sidebar automatically. If you specific other id, only snippets will rendered and put into your element
* @option {Function} onSidebarToggled Method will be called after toggled sidebar. Arguments: isOpened
* @option {Function} onInitContentArea Method will be called when initializing content area. It can return array of jQuery objects which will be initialized as container in content area. By default, all first level sections under content area will be initialized. Arguments: contentArea
* @option {Function} onContentChanged Callback will be called when content is changed. Includes add, delete, duplicate container or component. Or content of a component is changed. Arguments: event
Expand Down Expand Up @@ -78,7 +79,7 @@
debug: true,

// Version of KEditor
version: '1.1.0',
version: '1.1.1',

// Log function
log: flog,
Expand All @@ -97,6 +98,7 @@
btnDeleteContainerText: '<i class="fa fa-times"></i>',
btnDeleteComponentText: '<i class="fa fa-times"></i>',
defaultComponentType: 'text',
iframeMode: false,
snippetsUrl: 'snippets/default/snippets.html',
snippetsListId: 'keditor-snippets-list',
onSidebarToggled: function (isOpened) {
Expand Down Expand Up @@ -995,6 +997,12 @@
error('"getContent" function of component type "' + componentType + '" does not exist!');
}

var tempDiv = $('<div />').html(content);
tempDiv.find('[data-dynamic-href]').each(function () {
$(this).html('');
});
content = tempDiv.html();

return '<section data-type="' + dataType + '">' + content + '</section>';
},

Expand Down
2 changes: 2 additions & 0 deletions dist/js/keditor-1.1.1.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/js/keditor-1.1.1.min.js.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* KEditor Audio Component
* @copyright: Kademi (http://kademi.co)
* @author: Kademi (http://kademi.co)
* @version: 1.1.0
* @version: 1.1.1
* @dependencies: $, $.fn.draggable, $.fn.droppable, $.fn.sortable, Bootstrap, FontAwesome (optional)
*/
(function ($) {
Expand Down Expand Up @@ -162,7 +162,7 @@
* KEditor Google Map Component
* @copyright: Kademi (http://kademi.co)
* @author: Kademi (http://kademi.co)
* @version: 1.1.0
* @version: 1.1.1
* @dependencies: $, $.fn.draggable, $.fn.droppable, $.fn.sortable, Bootstrap, FontAwesome (optional)
*/
(function ($) {
Expand Down Expand Up @@ -261,7 +261,7 @@
* KEditor Photo Component
* @copyright: Kademi (http://kademi.co)
* @author: Kademi (http://kademi.co)
* @version: 1.1.0
* @version: 1.1.1
* @dependencies: $, $.fn.draggable, $.fn.droppable, $.fn.sortable, Bootstrap, FontAwesome (optional)
*/
(function ($) {
Expand Down Expand Up @@ -482,7 +482,7 @@
* KEditor Text Component
* @copyright: Kademi (http://kademi.co)
* @author: Kademi (http://kademi.co)
* @version: 1.1.0
* @version: 1.1.1
* @dependencies: $, $.fn.draggable, $.fn.droppable, $.fn.sortable, Bootstrap, FontAwesome (optional)
*/
(function ($) {
Expand Down Expand Up @@ -583,7 +583,7 @@
* KEditor Video Component
* @copyright: Kademi (http://kademi.co)
* @author: Kademi (http://kademi.co)
* @version: 1.1.0
* @version: 1.1.1
* @dependencies: $, $.fn.draggable, $.fn.droppable, $.fn.sortable, Bootstrap, FontAwesome (optional)
*/
(function ($) {
Expand Down Expand Up @@ -787,7 +787,7 @@
* KEditor Vimeo Component
* @copyright: Kademi (http://kademi.co)
* @author: Kademi (http://kademi.co)
* @version: 1.1.0
* @version: 1.1.1
* @dependencies: $, $.fn.draggable, $.fn.droppable, $.fn.sortable, Bootstrap, FontAwesome (optional)
*/
(function ($) {
Expand Down Expand Up @@ -902,7 +902,7 @@
* KEditor Youtube Component
* @copyright: Kademi (http://kademi.co)
* @author: Kademi (http://kademi.co)
* @version: 1.1.0
* @version: 1.1.1
* @dependencies: $, $.fn.draggable, $.fn.droppable, $.fn.sortable, Bootstrap, FontAwesome (optional)
*/
(function ($) {
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions examples/snippets/default/_dynamic_content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h1>It's dynamic content</h1>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/img/yenbai_vietnam.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/audio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/googlemap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/heading_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/heading_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/jumbotron.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/media_panel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/photo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/row_12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/row_3_3_3_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/row_3_6_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/row_4_4_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/row_4_8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/row_6_6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/row_8_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/snippet_06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/snippet_07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/snippets/default/preview/text.png
Binary file added examples/snippets/default/preview/video.png
Binary file added examples/snippets/default/preview/vimeo.png
Binary file added examples/snippets/default/preview/youtube.png
Loading

0 comments on commit 4ef560e

Please sign in to comment.