Home Explore Help
Register Sign In
oleg
/
vuex
mirror of https://github.com/vuejs/vuex.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

fix all examples and e2e tests

Evan You 9 years ago
parent
9624f311a5
commit
7fb8262a8c
12 changed files with 49 additions and 18 deletions
Unified View Show Diff Stats
  1. 1 1
      examples/counter-hot/Counter.vue
  2. 1 1
      examples/counter-hot/index.html
  3. 2 2
      examples/counter-hot/main.js
  4. 23 0
      examples/shopping-cart/currency.js
  5. 1 1
      examples/shopping-cart/index.html
  6. 5 2
      examples/shopping-cart/main.js
  7. 7 3
      examples/todomvc/components/App.vue
  8. 3 3
      examples/todomvc/components/Todo.vue
  9. 1 1
      examples/todomvc/index.html
  10. 2 2
      examples/todomvc/main.js
  11. 1 1
      examples/todomvc/vuex/store.js
  12. 2 1
      package.json

+ 1 - 1
examples/counter-hot/Counter.vue
View File 

@@ -18,7 +18,7 @@ import { recentHistory } from './vuex/getters'
 
 export default {
 
 export default {
 
   vuex: {
 
   vuex: {
 
     actions,
 
     actions,
 
-    state: {
 
+    getters: {
 
       count: state => state.count,
 
       count: state => state.count,
 
       recentHistory
 
       recentHistory
 
     }
 
     }

+ 1 - 1
examples/counter-hot/index.html
View File 

@@ -5,7 +5,7 @@
 
     <title>vuex counter example</title>
 
     <title>vuex counter example</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <counter></counter>
 
+    <div id="app"></div>
 
     <script src="build.js"></script>
 
     <script src="build.js"></script>
 
   </body>
 
   </body>
 
 </html>
 
 </html>

+ 2 - 2
examples/counter-hot/main.js
View File 

@@ -3,7 +3,7 @@ import store from './vuex/store'
 
 import Counter from './Counter.vue'
 
 import Counter from './Counter.vue'
 
 
 
 new Vue({
 
 new Vue({
 
-  el: 'body',
 
+  el: '#app',
 
   store,
 
   store,
 
-  components: { Counter }
 
+  render: h => h(Counter)
 
 })
 
 })

+ 23 - 0
examples/shopping-cart/currency.js
View File 

@@ -0,0 +1,23 @@
 
+const digitsRE = /(\d{3})(?=\d)/g
 
+
 
+export function currency (value, currency, decimals) {
 
+  value = parseFloat(value)
 
+  if (!isFinite(value) || (!value && value !== 0)) return ''
 
+  currency = currency != null ? currency : '$'
 
+  decimals = decimals != null ? decimals : 2
 
+  var stringified = Math.abs(value).toFixed(decimals)
 
+  var _int = decimals
 
+    ? stringified.slice(0, -1 - decimals)
 
+    : stringified
 
+  var i = _int.length % 3
 
+  var head = i > 0
 
+    ? (_int.slice(0, i) + (_int.length > 3 ? ',' : ''))
 
+    : ''
 
+  var _float = decimals
 
+    ? stringified.slice(-1 - decimals)
 
+    : ''
 
+  var sign = value < 0 ? '-' : ''
 
+  return sign + currency + head +
 
+    _int.slice(i).replace(digitsRE, '$1,') +
 
+    _float
 
+}

+ 1 - 1
examples/shopping-cart/index.html
View File 

@@ -5,7 +5,7 @@
 
     <title>vuex shopping cart example</title>
 
     <title>vuex shopping cart example</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <app></app>
 
+    <div id="app"></div>
 
     <script src="build.js"></script>
 
     <script src="build.js"></script>
 
   </body>
 
   </body>
 
 </html>
 
 </html>

+ 5 - 2
examples/shopping-cart/main.js
View File 

@@ -2,9 +2,12 @@ import 'babel-polyfill'
 
 import Vue from 'vue'
 
 import Vue from 'vue'
 
 import App from './components/App.vue'
 
 import App from './components/App.vue'
 
 import store from './vuex/store'
 
 import store from './vuex/store'
 
+import { currency } from './currency'
 
+
 
+Vue.filter('currency', currency)
 
 
 
 new Vue({
 
 new Vue({
 
-  el: 'body',
 
+  el: '#app',
 
   store,
 
   store,
 
-  components: { App }
 
+  render: h => h(App)
 
 })
 
 })

+ 7 - 3
examples/todomvc/components/App.vue
View File 

@@ -25,11 +25,11 @@
 
     <footer class="footer" v-show="todos.length">
 
     <footer class="footer" v-show="todos.length">
 
       <span class="todo-count">
 
       <span class="todo-count">
 
         <strong>{{ remaining }}</strong>
 
         <strong>{{ remaining }}</strong>
 
-        {{ remaining | pluralize 'item' }} left
 
+        {{ remaining | pluralize('item') }} left
 
       </span>
 
       </span>
 
       <ul class="filters">
 
       <ul class="filters">
 
-        <li v-for="(key, val) in filters">
 
-          <a href="#/{{$key}}"
 
+        <li v-for="(val, key) in filters">
 
+          <a :href="'#/' + key"
 
             :class="{ selected: visibility === key }"
 
             :class="{ selected: visibility === key }"
 
             @click="visibility = key">
 
             @click="visibility = key">
 
             {{ key | capitalize }}
 
             {{ key | capitalize }}
 
@@ -96,6 +96,10 @@ export default {
 
       }
 
       }
 
       e.target.value = ''
 
       e.target.value = ''
 
     }
 
     }
 
+  },
 
+  filters: {
 
+    pluralize: (n, w) => n === 1 ? w : (w + 's'),
 
+    capitalize: s => s.charAt(0).toUpperCase() + s.slice(1)
 
   }
 
   }
 
 }
 
 }
 
 </script>
 
 </script>

+ 3 - 3
examples/todomvc/components/Todo.vue
View File 

@@ -40,10 +40,10 @@ export default {
 
     }
 
     }
 
   },
 
   },
 
   directives: {
 
   directives: {
 
-    focus (value) {
 
+    focus (el, { value }, { context }) {
 
       if (value) {
 
       if (value) {
 
-        this.vm.$nextTick(() => {
 
-          this.el.focus()
 
+        context.$nextTick(() => {
 
+          el.focus()
 
         })
 
         })
 
       }
 
       }
 
     }
 
     }

+ 1 - 1
examples/todomvc/index.html
View File 

@@ -5,7 +5,7 @@
 
     <title>vuex todomvc example</title>
 
     <title>vuex todomvc example</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <app></app>
 
+    <div id="app"></div>
 
     <script src="build.js"></script>
 
     <script src="build.js"></script>
 
   </body>
 
   </body>
 
 </html>
 
 </html>

+ 2 - 2
examples/todomvc/main.js
View File 

@@ -4,6 +4,6 @@ import App from './components/App.vue'
 
 
 
 new Vue({
 
 new Vue({
 
   store, // inject store to all children
 
   store, // inject store to all children
 
-  el: 'body',
 
-  components: { App }
 
+  el: '#app',
 
+  render: h => h(App)
 
 })
 
 })

+ 1 - 1
examples/todomvc/vuex/store.js
View File 

@@ -24,7 +24,7 @@ const mutations = {
 
   },
 
   },
 
 
 
   DELETE_TODO (state, todo) {
 
   DELETE_TODO (state, todo) {
 
-    state.todos.$remove(todo)
 
+    state.todos.splice(state.todos.indexOf(todo), 1)
 
   },
 
   },
 
 
 
   TOGGLE_TODO (state, todo) {
 
   TOGGLE_TODO (state, todo) {

+ 2 - 1
package.json
View File 

@@ -49,6 +49,7 @@
 
     "eslint-config-vue": "^1.0.0",
 
     "eslint-config-vue": "^1.0.0",
 
     "function-bind": "^1.1.0",
 
     "function-bind": "^1.1.0",
 
     "mocha": "^2.3.4",
 
     "mocha": "^2.3.4",
 
+    "phantomjs-prebuilt": "^2.1.7",
 
     "rollup": "^0.32.0",
 
     "rollup": "^0.32.0",
 
     "rollup-plugin-babel": "^2.4.0",
 
     "rollup-plugin-babel": "^2.4.0",
 
     "sinon": "^1.17.3",
 
     "sinon": "^1.17.3",
 
@@ -56,7 +57,7 @@
 
     "todomvc-app-css": "^2.0.3",
 
     "todomvc-app-css": "^2.0.3",
 
     "uglify-js": "^2.6.2",
 
     "uglify-js": "^2.6.2",
 
     "vue": "^2.0.0-alpha.5",
 
     "vue": "^2.0.0-alpha.5",
 
-    "vue-loader": "^9.0.1",
 
+    "vue-loader": "^9.0.3",
 
     "webpack": "^1.12.8",
 
     "webpack": "^1.12.8",
 
     "webpack-dev-server": "^1.12.1"
 
     "webpack-dev-server": "^1.12.1"
 
   }
 
   }