pressing enter makes new paragraph after image/video

[fnpeditor.git] / src / editor / entrypoint.js

diff --git a/src/editor/entrypoint.js b/src/editor/entrypoint.js
index 528952b..13ca1ab 100644 (file)
--- a/src/editor/entrypoint.js
+++ b/src/editor/entrypoint.js
@@ -4,8 +4,8 @@
     /* globals requirejs, editor_init */
 
     requirejs.config({
     /* globals requirejs, editor_init */
 
     requirejs.config({

-        baseUrl: '/static/editor/src/editor',
-        
+        urlArgs: "bust=" + (new Date()).getTime(),
+

         paths: {
             'fnpjs': '../fnpjs',
             'libs': '../../libs',
         paths: {
             'fnpjs': '../fnpjs',
             'libs': '../../libs',


@@ -21,7 +21,7 @@
                     'libs/underscore': '../../libs/underscore-min',
                     'libs/bootstrap': '../../libs/bootstrap/js/bootstrap.min',
                     'libs/backbone': '../../libs/backbone-min',
                     'libs/underscore': '../../libs/underscore-min',
                     'libs/bootstrap': '../../libs/bootstrap/js/bootstrap.min',
                     'libs/backbone': '../../libs/backbone-min',

-
+                    'libs/ace/ace': '../../libs/ace/ace'

                 }
         },
 
                 }
         },
 


@@ -38,7 +38,10 @@
             '../../libs/backbone-min': {
                 exports: 'Backbone',
                 deps: ['libs/jquery', 'libs/underscore']
             '../../libs/backbone-min': {
                 exports: 'Backbone',
                 deps: ['libs/jquery', 'libs/underscore']

-            }
+            },
+            '../../libs/ace/ace': {
+                exports: 'ace'
+            },

         }
 
     });
         }
 
     });