From 90dbf3b18e9ed57f9936210c33c80276df3670f5 Mon Sep 17 00:00:00 2001
From: Jinjiang <zhaojinjiang@me.com>
Date: Tue, 26 Apr 2016 12:51:07 +0800
Subject: [PATCH] ci bugfix

---
 build/ci.sh                                |  0
 src/compiler/compile.js                    |  2 +-
 src/global-api.js                          | 28 +++++++++++-----------
 test/unit/specs/parsers/expression_spec.js |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 build/ci.sh

diff --git a/build/ci.sh b/build/ci.sh
old mode 100644
new mode 100755
diff --git a/src/compiler/compile.js b/src/compiler/compile.js
index d94a51272bf..407ac25b063 100644
--- a/src/compiler/compile.js
+++ b/src/compiler/compile.js
@@ -4,8 +4,8 @@ import { compileProps } from './compile-props'
 import { parseText, tokensToExp } from '../parsers/text'
 import { parseDirective } from '../parsers/directive'
 import { parseTemplate } from '../parsers/template'
-import { resolveAsset } from '../util/index'
 import {
+  resolveAsset,
   toArray,
   warn,
   remove,
diff --git a/src/global-api.js b/src/global-api.js
index 3ec25fa5f9a..d9539c34326 100644
--- a/src/global-api.js
+++ b/src/global-api.js
@@ -1,17 +1,3 @@
-import {
-  set,
-  del,
-  nextTick,
-  mergeOptions,
-  classify,
-  toArray,
-  commonTagRE,
-  reservedTagRE,
-  warn,
-  isPlainObject,
-  extend
-} from './util/index'
-
 import config from './config'
 import directives from './directives/public/index'
 import elementDirectives from './directives/element/index'
@@ -27,6 +13,20 @@ import * as transition from './transition/index'
 import FragmentFactory from './fragment/factory'
 import internalDirectives from './directives/internal/index'
 
+const {
+  set,
+  del,
+  nextTick,
+  mergeOptions,
+  classify,
+  toArray,
+  commonTagRE,
+  reservedTagRE,
+  warn,
+  isPlainObject,
+  extend
+} = util
+
 export default function (Vue) {
   /**
    * Vue and every constructor that extends Vue has an
diff --git a/test/unit/specs/parsers/expression_spec.js b/test/unit/specs/parsers/expression_spec.js
index 9776d5fd0a1..6a9b9efef7d 100644
--- a/test/unit/specs/parsers/expression_spec.js
+++ b/test/unit/specs/parsers/expression_spec.js
@@ -178,7 +178,7 @@ var testCases = [
     scope: {
       c: '\'c'
     },
-    expected: "a\'b\'c",
+    expected: "a'b'c",
     paths: ['c']
   },
   {