Skip to content

Commit

Permalink
Merge pull request vuejs#306 from kewah/master
Browse files Browse the repository at this point in the history
ViewModel.require with [email protected]
  • Loading branch information
yyx990803 committed Jun 11, 2014
2 parents c853d21 + 93f7b74 commit f3a1698
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ var config = require('./config'),
ViewModel = require('./viewmodel'),
utils = require('./utils'),
makeHash = utils.hash,
assetTypes = ['directive', 'filter', 'partial', 'effect', 'component']

// require these so Browserify can catch them
// so they can be used in Vue.require
require('./observer')
require('./transition')
assetTypes = ['directive', 'filter', 'partial', 'effect', 'component'],
// Internal modules that are exposed for plugins
pluginAPI = {
utils: utils,
config: config,
transition: require('./transition'),
observer: require('./observer')
}

ViewModel.options = config.globalAssets = {
directives : require('./directives'),
Expand Down Expand Up @@ -83,8 +85,8 @@ ViewModel.use = function (plugin) {
/**
* Expose internal modules for plugins
*/
ViewModel.require = function (path) {
return require('./' + path)
ViewModel.require = function (module) {
return pluginAPI[module]
}

ViewModel.extend = extend
Expand Down

0 comments on commit f3a1698

Please sign in to comment.