Commit ade21b2f3b22bc064bd35421fd6b66fc0d082457

Anon Ray
Thu Jan 23 15:10:24 IST 2014

Tree SHA1: 1f975bf
Parent SHA1: 1d59374 (Add uploads support)
raw diff | raw patch

Fix: JS/CSS plugin getting executed when loading up for editing

  - Currently implemented is a hacky workaround around this problem. See
    models.js > Plugin Model > getCode function.
  - Small fix in editor to not take empty strings as valid tags.

mouchak/server.py 2 -+
mouchak/static/js/editor.js 23 ---------++++++++++++++
mouchak/static/js/models.js 17 -++++++++++++++++

Diff rendering mode:
inline
side by side

mouchak/server.py

 def edit():
     if "logged_in" in flask.session:
         flask.session['key'] = conf.SECRET_KEY
         #print getContent()
         return flask.render_template('editor.html', content=getContent(),
                                      title=conf.SITE_TITLE)
     else:
-…
         content = getContent()['content']
         return flask.make_response(json.dumps(content), '200 OK',
                                {'Content-Type': 'application/json'})
 @app.route('/pages/<_id>', methods=['GET'])
 def listPage(_id):

mouchak/static/js/editor.js

         split('-')[1];
       var content = this.model.get('content')[idx];
       content = new M.types.model[content.type](content);
       console.log('model inited ', content);
+      //console.log('model inited ', content);
       this.editing = true;
       this.edit_idx = idx;
       var contentview = new ContentView({model: content});
-…
       this.render();
       return false;
     },
     updatePage: function() {
+    updatePage: function(event) {
+      event.preventDefault();
       var name = $('#name').val();
       var title = $('#title').val();
       var children = $('#children').val();
       children = (children === '') ? [] : children.split(',');
+      var children = [];
+      //var children = $('#children').val();
+      //children = (children === '') ? [] : children.split(',');
       this.model.set({'name': name, 'title': title, 'children': children});
       if($('#showNav').is(':checked')) {
-…
         if(this.model.get('src')) {
           var plugin_type = this.model.get('plugin_type');
           plugin_type = (plugin_type === 'js') ? 'javascript' : 'css';
+          //console.log('getting code..');
           this.model.getCode(function(data) {
+            //console.log('got code..');
             $('#plugin-edit').html(escapeHtml(data));
             M.editor.code.init('plugin-edit', plugin_type);
           });
-…
       $('#contentview [m-data-target]').each(function(idx, elem) {
         prop = $(elem).attr('m-data-target');
         if(prop === 'tags') {
           val = $(elem).val().split(',');
+          val = ($(elem).val()) ? $(elem).val().split(',') : [];
         }
         else {
           val = $(elem).val();
-…
       else if(this.$select.val() === 'plugin') {
         var data = M.editor.code.save('plugin-edit');
         this.model.saveCode(data, function(resp) {
           console.log('plugin saved..');
+          //console.log('plugin saved..');
         });
       }
       this.model.set(new_attrs);
+      //console.log('content updated');
       M.editor.pageview.updateContent(this.model.toJSON());
     },
     cleanUp: function() {
-…
       var self = this;
       M.editor.showOverlay();
       var $form = $('#plugin-upload-form')[0];
       console.log($form);
+      //console.log($form);
       var formdata = new FormData($form);
       console.log(formdata);
+      //console.log(formdata);
       $.ajax({
         type: 'POST',
         url: M.PluginUploadURL(),
-…
           self.model.set({'src': response.path})
           self.render();
           M.editor.hideOverlay();
           console.log(self.model.toJSON());
+          //console.log(self.model.toJSON());
         }
       });
     }

mouchak/static/js/models.js

     // get the source code of the plugin from the src path
     getCode: function(cb) {
       var self = this;
+      //NOTE: jQuery executes the code(css or js) as soon as it is returned by
+      //the server. Apparently, there is no way to tell jQuery not to execute
+      //the piece of code retrieved.
+      //Hecnce, right now its a HACK to workaround this problem.
+      // We use dataFilter which is called by jQuery to process the raw xhr
+      // response sent, and jQuery expects back a filtered/sanitized data so
+      // that it can call the success callback with that data. We use
+      // dataFilter to do our processing there, and return an empty string;
+      // this apparently prevents jQuery from executing the code.
+      // TODO: find a better way to workaround this.
+      // TODO: find out how cloud-based IDEs load up code files for editing.
       $.ajax({
         type: 'GET',
         url: self.get('src'),
+        dataFilter: function(data, type) {
+          cb(data);
+          return '';
+        },
         cache: false,
         success: function(data) {
           cb(data);
+          //cb(data);
         }
       });
     },

Commit ade21b2f3b22bc064bd35421fd6b66fc0d082457

mouchak/server.py

mouchak/static/js/editor.js

mouchak/static/js/models.js

Gitorious