Merge pull request #277 from ilvalle/fix-editor

codemirror 3.19 and directory cleanup
2013-10-23 17:44:15 -07:00
parent 1c5bad24f3 290cb2f1a7
commit 811a44fd14
54 changed files with 578 additions and 778 deletions
@@ -583,7 +583,7 @@ def edit():
                response.headers["web2py-component-flash"] = T('Preferences saved correctly')
            else:
                response.headers["web2py-component-flash"] = T('Preferences saved on session only')
-            response.headers["web2py-component-command"] = "update_editor(%s);jQuery('a[href=#editor_settings] button.close').click();" % response.json(config.read())
+            response.headers["web2py-component-command"] = "update_editor(%s);$('a[href=#editor_settings] button.close').click();" % response.json(config.read())
            return
        else:
            details = {'filename':'settings', 'id':'editor_settings', 'force': False}
@@ -749,6 +749,7 @@ def edit():
        return response.json({'file_hash': file_hash, 'saved_on': saved_on, 'functions': functions, 'controller': controller, 'application': request.args[0], 'highlight': highlight})
    else:
        file_details = dict(app=request.args[0],
+                    editor_settings=preferences,
                    filename=filename,
                    filetype=filetype,
                    data=data,