Merge branch 'master' into quote-module

# Conflicts: # codex-editor.js # codex-editor.js.map
2026-03-18 08:29:52 +01:00 · 2017-01-26 16:18:21 +03:00 · 2017-01-26 16:18:21 +03:00 · bf065696b8
commit bf065696b8
parent 3026ac5d34 27ef016967
8 changed files with 5005 additions and 148 deletions
--- a/example.html
+++ b/example.html
@ -134,17 +134,19 @@
                    defaultStyle : 'withPhoto'
                }
            },
-            image: {
-                type: 'image',
+            image_extended: {
+                type: 'image_extended',
                iconClassname: 'ce-icon-picture',
-                make: image.make,
                appendCallback: image.appendCallback,
-                settings: image.makeSettings,
+                prepare: image.prepare,
+                makeSettings: image.makeSettings,
                render: image.render,
                save: image.save,
                isStretched: true,
                displayInToolbox: true,
-                enableLineBreaks: false
+                config: {
+                    uploadUrl : '/club/fetch'
+                }
            },
            instagram: {
                type: 'instagram',