You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/04/01 06:03:11 UTC
[06/50] [abbrv] incubator-weex git commit: * [html5] fix modules.
* [html5] fix modules.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aee7db8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aee7db8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aee7db8a
Branch: refs/heads/dev
Commit: aee7db8a9edf5780cdc2a06b9a574d5f9343997b
Parents: 44ea95e
Author: MrRaindrop <te...@gmail.com>
Authored: Tue Mar 28 11:23:48 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Tue Mar 28 11:23:48 2017 +0800
----------------------------------------------------------------------
html5/render/vue/env/weex.js | 5 ----
html5/render/vue/modules/index.js | 40 ++++++++++++++++--------------
package.json | 8 +++---
packages/weex-vue-render/package.json | 2 +-
4 files changed, 26 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aee7db8a/html5/render/vue/env/weex.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/env/weex.js b/html5/render/vue/env/weex.js
index d492e0c..685e5b3 100644
--- a/html5/render/vue/env/weex.js
+++ b/html5/render/vue/env/weex.js
@@ -2,7 +2,6 @@
import './wx-env'
import * as utils from '../utils'
-import { requireWeexModule } from '../modules'
const weexModules = {}
@@ -16,10 +15,6 @@ const weex = {
},
requireModule (moduleName) {
- const module = requireWeexModule(moduleName)
- if (module) {
- return module
- }
return weexModules[moduleName]
},
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aee7db8a/html5/render/vue/modules/index.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/modules/index.js b/html5/render/vue/modules/index.js
index 78af3ca..917eea7 100644
--- a/html5/render/vue/modules/index.js
+++ b/html5/render/vue/modules/index.js
@@ -1,10 +1,10 @@
// modules from render/browesr
-import Event from '../../browser/extend/api/event'
-import Geolocation from '../../browser/extend/api/geolocation'
-import PageInfo from '../../browser/extend/api/pageInfo'
-import Storage from '../../browser/extend/api/storage'
-import Stream from '../../browser/extend/api/stream'
-import Clipboard from '../../browser/extend/api/clipboard'
+import event from '../../browser/extend/api/event'
+import geolocation from '../../browser/extend/api/geolocation'
+import pageInfo from '../../browser/extend/api/pageInfo'
+import storage from '../../browser/extend/api/storage'
+import stream from '../../browser/extend/api/stream'
+import clipboard from '../../browser/extend/api/clipboard'
// custom modules
import animation from './animation'
@@ -13,6 +13,15 @@ import modal from './modal'
import navigator from './navigator'
import webview from './webview'
+const legacyModules = {
+ event,
+ geolocation,
+ pageInfo,
+ storage,
+ stream,
+ clipboard
+}
+
const modules = {
animation,
dom,
@@ -21,20 +30,13 @@ const modules = {
webview
}
-export function requireWeexModule (name) {
- if (modules[name]) {
- return modules[name]
- }
- return null
-}
-
export default {
init (weex) {
- weex.install(Event)
- weex.install(Geolocation)
- weex.install(PageInfo)
- weex.install(Storage)
- weex.install(Stream)
- weex.install(Clipboard)
+ for (const k in legacyModules) {
+ weex.install(legacyModules[k])
+ }
+ for (const k in modules) {
+ weex.registerModule(k, modules[k])
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aee7db8a/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 6272900..4764702 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"version": "0.4.0",
"subversion": {
"browser": "0.5.0",
- "vue-render": "0.11.0",
+ "vue-render": "0.11.1",
"framework": "0.19.6",
"transformer": ">=0.1.5 <0.5"
},
@@ -136,9 +136,9 @@
"sinon": "^1.17.4",
"sinon-chai": "^2.8.0",
"uglify-js": "^2.6.4",
- "vue": "^2.1.10",
- "vue-loader": "^11.2.0",
- "vue-template-compiler": "^2.1.10",
+ "vue": "^2.2.6",
+ "vue-loader": "^11.3.3",
+ "vue-template-compiler": "^2.2.6",
"webdriver-client": "~1.0.0",
"webpack": "^1.13.1",
"weex-components": "^0.2.0",
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aee7db8a/packages/weex-vue-render/package.json
----------------------------------------------------------------------
diff --git a/packages/weex-vue-render/package.json b/packages/weex-vue-render/package.json
index 5652835..8868112 100644
--- a/packages/weex-vue-render/package.json
+++ b/packages/weex-vue-render/package.json
@@ -1,6 +1,6 @@
{
"name": "weex-vue-render",
- "version": "0.11.0",
+ "version": "0.11.1",
"description": "Weex built-in components for Vue 2.x.",
"license": "Apache-2.0",
"main": "src/render/vue/index.js",