feat: restructure

imcvampire · imcvampire · commit f57510a6da58 · 2017-03-09T12:01:20.000+07:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-axios",
-  "version": "1.2.2",
+  "version": "2.0.0",
   "description": "A small wrapper for integrating axios to Vuejs",
   "main": "dist/vue-axios.min.js",
   "scripts": {
diff --git a/src/index.js b/src/index.js
@@ -1,63 +1,5 @@
 (function () {
 
-/**
- *  Copied from vue-resource
- */
-
-const { slice } = [];
-
-function isFunction(val) {
-  return typeof val === 'function';
-}
-
-const isArray = Array.isArray;
-
-function isPlainObject(obj) {
-  return isObject(obj) && Object.getPrototypeOf(obj) == Object.prototype;
-}
-
-function isObject(obj) {
-  return obj !== null && typeof obj === 'object';
-}
-
-function _merge(target, source, deep) {
-  for (var key in source) {
-    if (deep && (isPlainObject(source[key]) || isArray(source[key]))) {
-      if (isPlainObject(source[key]) && !isPlainObject(target[key])) {
-        target[key] = {};
-      }
-      if (isArray(source[key]) && !isArray(target[key])) {
-        target[key] = [];
-      }
-      _merge(target[key], source[key], deep);
-    } else if (source[key] !== undefined) {
-      target[key] = source[key];
-    }
-  }
-}
-
-function merge(target) {
-
-  var args = slice.call(arguments, 1);
-
-  args.forEach((source) => {
-    _merge(target, source, true);
-  });
-
-  return target;
-}
-
-function options(fn, obj, opts) {
-
-  opts = opts || {};
-
-  if (isFunction(opts)) {
-    opts = opts.call(obj);
-  }
-
-  return merge(fn.bind({$vm: obj, $options: opts}), fn, {$options: opts});
-}
-
 /**
  * Install plugin
  * @param Vue
@@ -81,10 +23,16 @@ function plugin(Vue, axios) {
 
     axios: {
       get() {
-        return options(Vue.axios, this, this.$options.axios);
+        return axios;
       }
     },
 
+    $http: {
+      get() {
+        return axios;
+      }
+    }
+
   });
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-axios",`
`3`		`- "version": "1.2.2",`
	`3`	`+ "version": "2.0.0",`
`4`	`4`	`"description": "A small wrapper for integrating axios to Vuejs",`
`5`	`5`	`"main": "dist/vue-axios.min.js",`
`6`	`6`	`"scripts": {`