Merge remote-tracking branch 'refs/remotes/origin/develop'

VoliJS · Nov 5, 2015 · c0cc3c2 · c0cc3c2
2 parents 66fe614 + a04a113
commit c0cc3c2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/nestedtypes.js b/nestedtypes.js
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "LICENSE"
   ],
   "license": "MIT",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "scripts": {
     "test": "node_modules/.bin/mocha",
     "build": "./node_modules/.bin/webpack",

diff --git a/src/main.js b/src/main.js
@@ -44,3 +44,16 @@ _.extend( exports, Backbone, {
         }
     }
 });
+
+function linkToProp( name ){
+    return {
+        get : function(){ return Backbone[ name ]; },
+        set : function( value ){ Backbone[ name ] = value; }
+    }
+}
+
+// allow sync and jQuery override
+Object.defineProperties( exports, {
+    'sync' : linkToProp( 'sync' ),
+    '$'    : linkToProp( '$' )
+});