Change integration with backform set by model

enzolutions · Jan 7, 2015 · e8a1c18 · e8a1c18
1 parent d8f2e5f
commit e8a1c18
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Backbone.Drupal is a standalone plugin to connect Marionette JS and Backbone JS
 
 Originally Inspired in JS files from Drupal 7 Module <a href="https://drupal.org/project/backbone" target="_blank">https://drupal.org/project/backbone</a>
 
-Backbone.Drupal has compatibility with [Backform](http://amiliaapp.github.io/backform/index.html) Drupal 8 return an object for each property if you enable this compatibility attibuttes will be flatten to an array with value property. But this feature could be used for other implementations.
+Backbone.Drupal has compatibility with [Backform](http://amiliaapp.github.io/backform/index.html) Drupal 8 return an object for each property if you enable this compatibility attibuttes will be flatten to an array property -> value. But this feature could be used for other implementations.
 
 
 # Usage
@@ -56,9 +56,6 @@ Your configuration must look similar to following image.
           dataType: '.json'
         };
 
-        // Set Backform Compatibility (amiliaapp.github.io/backform/index.html)
-        //Backbone.Drupal.backform = true;
-
         // Define auth object, set crossDomain if is necessary
         var Auth = new Backbone.Drupal.Auth({crossDomain: true});
         // Request executed in sync mode
@@ -69,7 +66,8 @@ Your configuration must look similar to following image.
 
           // Check user retrieve
 
-          var User = new Backbone.Drupal.Models.User({uid: 1});
+          // Set Backform Compatibility (amiliaapp.github.io/backform/index.html)
+          var User = new Backbone.Drupal.Models.User({uid: 1, backform: true});
           User.fetch({
             success: function (user) {
               // Check information retrived, could be used directly in a template

diff --git a/backbone.drupal.services.js b/backbone.drupal.services.js
@@ -18,7 +18,7 @@ Backbone.Drupal.Models.Node = Backbone.Drupal.Models.Base.extend({
   },
 
   toJSON: function() {
-    if(Backbone.Drupal.backform) {
+    if(this.backform) {
       return Backbone.Drupal.Models.Base.prototype.toJSON.call(this);
     }
     else {
@@ -28,7 +28,7 @@ Backbone.Drupal.Models.Node = Backbone.Drupal.Models.Base.extend({
     }
   },
   parse: function (data) {
-      if(Backbone.Drupal.backform) {
+      if(this.backform) {
         var attributes = [];
         _.each(data, function(element, index, list) {
           attributes[index] = element[0].value;
@@ -72,7 +72,7 @@ Backbone.Drupal.Models.Comment = Backbone.Drupal.Models.Base.extend({
   // Override toJSON function to nest all attributes in a { comment: ... } key
   // to make this work with the Services module implementation of comment PUSH/PUT.
   toJSON: function() {
-    if(Backbone.Drupal.backform) {
+    if(this.backform) {
       return Backbone.Drupal.Models.Base.prototype.toJSON.call(this);
     }
     else {
@@ -82,7 +82,7 @@ Backbone.Drupal.Models.Comment = Backbone.Drupal.Models.Base.extend({
     }
   },
   parse: function (data) {
-      if(Backbone.Drupal.backform) {
+      if(this.backform) {
         var attributes = [];
         _.each(data, function(element, index, list) {
           attributes[index] = element[0].value;
@@ -105,7 +105,7 @@ Backbone.Drupal.Models.File = Backbone.Drupal.Models.Base.extend({
   // Override toJSON function to nest all attributes in a { file: ... } key
   // to make this work with the Services module implementation of file PUSH/PUT.turn data;
   toJSON: function() {
-    if(Backbone.Drupal.backform) {
+    if(this.backform) {
       return Backbone.Drupal.Models.Base.prototype.toJSON.call(this);
     }
     else {
@@ -115,7 +115,7 @@ Backbone.Drupal.Models.File = Backbone.Drupal.Models.Base.extend({
     }
   },
   parse: function (data) {
-      if(Backbone.Drupal.backform) {
+      if(this.backform) {
         var attributes = [];
         _.each(data, function(element, index, list) {
           attributes[index] = element[0].value;

diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
     "backbone.drupal.js",
     "backbone.drupal.services.js"
   ],
-  "version": "0.2.1-alpha",
+  "version": "0.2.1-beta",
   "homepage": "http://enzolutions.com/projects/backbone_drupal/",
   "author": {
     "name": "enzo - Eduardo Garcia",