github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #583 from QingWei-Li/feat/vue-template-whitespace 

Feat/vue template whitespace
pull/594/head
杨奕 2016-10-22 17:41:59 +08:00 committed by GitHub
parent a4175a74e2 56f4167c3c
commit 588523e808
8 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/config.js
View File

@ -13,6 +13,7 @@ Object.keys(dependencies).forEach(function(key) {
}); });
externals['element-ui/src/utils/clickoutside'] = 'element-ui/lib/utils/clickoutside'; externals['element-ui/src/utils/clickoutside'] = 'element-ui/lib/utils/clickoutside';
externals['element-ui/src/utils/date'] = 'element-ui/lib/utils/date';
externals['element-ui/src/utils/popper'] = 'element-ui/lib/utils/popper'; externals['element-ui/src/utils/popper'] = 'element-ui/lib/utils/popper';
externals['element-ui/src/utils/vue-popper'] = 'element-ui/lib/utils/vue-popper'; externals['element-ui/src/utils/vue-popper'] = 'element-ui/lib/utils/vue-popper';
externals['element-ui/src/utils/resize-event'] = 'element-ui/lib/utils/resize-event'; externals['element-ui/src/utils/resize-event'] = 'element-ui/lib/utils/resize-event';

2
build/cooking.common.js
View File

@ -14,5 +14,5 @@ cooking.set({
cooking.add('output.filename', 'element-ui.common.js'); cooking.add('output.filename', 'element-ui.common.js');
cooking.add('loader.js.exclude', config.jsexclude); cooking.add('loader.js.exclude', config.jsexclude);
cooking.add('vue.preserveWhitespace', false);
module.exports = cooking.resolve(); module.exports = cooking.resolve();

1
build/cooking.component.js
View File

@ -15,4 +15,5 @@ cooking.set({
cooking.add('output.filename', '[name]/index.js'); cooking.add('output.filename', '[name]/index.js');
cooking.add('loader.js.exclude', config.jsexclude); cooking.add('loader.js.exclude', config.jsexclude);
cooking.add('vue.preserveWhitespace', false);
module.exports = cooking.resolve(); module.exports = cooking.resolve();

2
build/cooking.conf.js
View File

@ -14,5 +14,5 @@ cooking.set({
cooking.add('output.filename', 'index.js'); cooking.add('output.filename', 'index.js');
cooking.add('loader.js.exclude', config.jsexclude); cooking.add('loader.js.exclude', config.jsexclude);
cooking.add('vue.preserveWhitespace', false);
module.exports = cooking.resolve(); module.exports = cooking.resolve();

1
build/cooking.demo.js
View File

@ -91,4 +91,5 @@ if (process.env.NODE_ENV === 'production') {
cooking.add('externals.vue-router', 'VueRouter'); cooking.add('externals.vue-router', 'VueRouter');
} }
cooking.add('vue.preserveWhitespace', false);
module.exports = cooking.resolve(); module.exports = cooking.resolve();

1
build/cooking.test.js
View File

@ -24,4 +24,5 @@ cooking.add('preLoader.0', {
if (!process.env.CI_ENV) { if (!process.env.CI_ENV) {
cooking.add('plugins.process', new ProgressBarPlugin()); cooking.add('plugins.process', new ProgressBarPlugin());
} }
cooking.add('vue.preserveWhitespace', false);
module.exports = cooking.resolve(); module.exports = cooking.resolve();

4
package.json
View File

@ -99,8 +99,8 @@
"theaterjs": "^3.0.0", "theaterjs": "^3.0.0",
"uppercamelcase": "^1.1.0", "uppercamelcase": "^1.1.0",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"vue": "^2.0.2", "vue": "^2.0.3",
"vue-loader": "^9.5.1", "vue-loader": "^9.7.0",
"vue-markdown-loader": "^0.5.1", "vue-markdown-loader": "^0.5.1",
"vue-router": "^2.0.0", "vue-router": "^2.0.0",
"webpack": "^1.13.2", "webpack": "^1.13.2",

17
src/utils/clickoutside.js
View File

@ -45,15 +45,14 @@ export default {
}, },
unbind(el) { unbind(el) {
nodeList.splice(el[ctx].id, 1); let len = nodeList.length;
delete el[ctx];
},
install(Vue) { for (let i = 0; i < len; i++) {
/* istanbul ignore next */ if (nodeList[i][ctx].id === el[ctx].id) {
Vue.directive('clickoutside', { nodeList.splice(i, 1);
bind: this.bind, delete el[ctx];
unbind: this.unbind break;
}); }
}
} }
}; };