diff --git a/@salix/app/src/app.js b/@salix/app/src/app.js
index e9fa3dc624..cf822393de 100644
--- a/@salix/app/src/app.js
+++ b/@salix/app/src/app.js
@@ -1 +1 @@
-import {ng} from '@salix/vendor'
\ No newline at end of file
+import {ng} from '@salix/vendor';
diff --git a/@salix/core/src/button/button.bt.js b/@salix/core/src/button/button.bt.js
index 9de37f1faf..bffd70bd11 100644
--- a/@salix/core/src/button/button.bt.js
+++ b/@salix/core/src/button/button.bt.js
@@ -3,11 +3,11 @@ import * as util from '../util';
import * as constant from '../constants';
import template from './button.bt.html';
-const DEFAULT_CLASS = ''; // clase css bootstrap. Pendiente de definir
-const DEFAULT_TEXT = constant.BUTTON_NAME;
-
-export const NAME = util.getFactoryName(constant.BUTTON_NAME + constant.BOOTSTRAPFRAMEWORK) //vnbuttonmtFactory
+const _NAME = 'button';
+const DEFAULT_CLASS = '';
+const DEFAULT_TEXT = 'Button';
+export const NAME = util.getFactoryName(_NAME + constant.BOOTSTRAP_FRAMEWORK);
export function factory() {
return {
@@ -19,6 +19,6 @@ export function factory() {
typeName: 'button'
}
}
-};
+}
-_module.factory(NAME, factory);
\ No newline at end of file
+_module.factory(NAME, factory);
diff --git a/@salix/core/src/button/button.js b/@salix/core/src/button/button.js
index 451cd0f801..6ce332d6c7 100644
--- a/@salix/core/src/button/button.js
+++ b/@salix/core/src/button/button.js
@@ -1,10 +1,9 @@
import {module as _module} from '../module';
import * as resolveFactory from '../resolveDefaultComponents';
-import {BUTTON_NAME} from '../constants';
import * as util from '../util';
-
-export const NAME = util.getName(BUTTON_NAME);
+const _NAME = 'button';
+export const NAME = util.getName(_NAME);
directive.$inject =[resolveFactory.NAME];
@@ -12,7 +11,7 @@ export function directive (resolve){
return{
require:'E',
template: function(_,attr){
- return resolve.getTemplate(BUTTON_NAME,attr);
+ return resolve.getTemplate(_NAME, attr);
}
}
}
diff --git a/@salix/core/src/button/button.mt.js b/@salix/core/src/button/button.mt.js
index 8df62bc37f..d1b28ced10 100644
--- a/@salix/core/src/button/button.mt.js
+++ b/@salix/core/src/button/button.mt.js
@@ -3,13 +3,13 @@ import * as util from '../util';
import * as constant from '../constants';
import template from './button.mt.html';
+const _NAME = 'button';
const DEFAULT_CLASS = 'mdl-button mdl-js-button mdl-button--raised';
-const DEFAULT_TEXT = constant.BUTTON_NAME;
+const DEFAULT_TEXT = 'Button';
-export const NAME = util.getFactoryName(constant.BUTTON_NAME + constant.MATERIALDESIGNFRAMEWORK); //buttonmtFactory
+export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK);
-
-export function factoryMt() {
+export function factory() {
return {
template: template,
default: {
@@ -19,6 +19,6 @@ export function factoryMt() {
typeName: 'button'
}
}
-};
+}
-_module.factory(NAME, factoryMt);
\ No newline at end of file
+_module.factory(NAME, factory);
diff --git a/@salix/core/src/constants.js b/@salix/core/src/constants.js
index 54088e881c..8707b4c2f7 100644
--- a/@salix/core/src/constants.js
+++ b/@salix/core/src/constants.js
@@ -1,10 +1,10 @@
-// nombre del prefijo del proyecto
-export const PREFIX ='vn'
-// nombre del framework css
+
+// Proyect prefix name
+export const PREFIX ='vn';
+
+// CSS frameworks
export const MATERIAL_DESIGN_FRAMEWORK = 'mt';
export const BOOTSTRAP_FRAMEWORK = 'bt';
-// directive name
-export const BUTTON_NAME ='button';
-export const BUTTON_ICON_NAME ='buttonIcon';
-//dependency module
-export const EMPTYDEPENDECIES=[];
\ No newline at end of file
+
+// Module dependencies
+export const EMPTY_DEPENDECIES = [];
diff --git a/@salix/core/src/interpolate.js b/@salix/core/src/interpolate.js
index b620667b38..f65e54dcb1 100644
--- a/@salix/core/src/interpolate.js
+++ b/@salix/core/src/interpolate.js
@@ -164,4 +164,4 @@ export class Interpolate
}
-_module.provider(NAME,Interpolate);
\ No newline at end of file
+_module.provider(NAME, Interpolate);
diff --git a/@salix/core/src/module.js b/@salix/core/src/module.js
index 08809e8752..21772a11d8 100644
--- a/@salix/core/src/module.js
+++ b/@salix/core/src/module.js
@@ -1,9 +1,8 @@
import {ng} from '@salix/vendor';
-import {EMPTYDEPENDECIES} from './constants';
+import {EMPTY_DEPENDECIES} from './constants';
import {getModuleName} from './util';
-
export const NAME = getModuleName('core');
-export const module = ng.module(NAME,EMPTYDEPENDECIES);
+export const module = ng.module(NAME,EMPTY_DEPENDECIES);
diff --git a/index.html b/index.html
index 774ef01c56..0a47130a54 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,6 @@
-
diff --git a/npm-debug.log b/npm-debug.log
new file mode 100644
index 0000000000..dc027a8b7e
--- /dev/null
+++ b/npm-debug.log
@@ -0,0 +1,26 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/bin/nodejs', '/usr/bin/npm', 'run', 'dev' ]
+2 info using npm@1.4.21
+3 info using node@v4.4.7
+4 verbose run-script [ 'predev', 'dev', 'postdev' ]
+5 info predev salix-app@1.0.0
+6 info dev salix-app@1.0.0
+7 verbose unsafe-perm in lifecycle true
+8 info salix-app@1.0.0 Failed to exec dev script
+9 error salix-app@1.0.0 dev: `webpack --progress --colors --watch`
+9 error Exit status 1
+10 error Failed at the salix-app@1.0.0 dev script.
+10 error This is most likely a problem with the salix-app package,
+10 error not with npm itself.
+10 error Tell the author that this fails on your system:
+10 error webpack --progress --colors --watch
+10 error You can get their info via:
+10 error npm owner ls salix-app
+10 error There is likely additional logging output above.
+11 error System Linux 4.7.0-1-amd64
+12 error command "/usr/bin/nodejs" "/usr/bin/npm" "run" "dev"
+13 error cwd /home/juan/Proyectos/salix
+14 error node -v v4.4.7
+15 error npm -v 1.4.21
+16 error code ELIFECYCLE
+17 verbose exit [ 1, true ]
diff --git a/package.json b/package.json
index 2be0cf4bd4..083501fea4 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,6 @@
"raw-loader": "*"
},
"scripts": {
- "build": "webpack --progress --colors"
+ "dev": "webpack --progress --colors --watch"
}
-}
\ No newline at end of file
+}
diff --git a/webpack.config.js b/webpack.config.js
index 1565843b09..1da40780f5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,7 +5,6 @@ var path = require ('path');
module.exports =
{
entry: {
- 'salix.vendor': ['@salix/vendor'],
'salix.core': ['@salix/core'],
'salix.app': ['@salix/app']
},
@@ -37,7 +36,7 @@ module.exports =
},
plugins: [
new webpack.optimize.CommonsChunkPlugin ({
- name: 'salix.vendor'
+ name: 'salix.core'
})
]
};