Skip to content

Commit

Permalink
corrections - alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
eddow committed Nov 15, 2018
1 parent 0b7b0b9 commit bbc7b26
Show file tree
Hide file tree
Showing 13 changed files with 78 additions and 55 deletions.
47 changes: 28 additions & 19 deletions package.json
Expand Up @@ -4,7 +4,7 @@
"description": "Semantic-ui2 + vue2",
"main": "dist/v-semantic.js",
"scripts": {
"test": "node fuse test",
"prepack": "webpack",
"lint": "eslint src"
},
"keywords": [
Expand All @@ -30,35 +30,44 @@
},
"homepage": "https://github.com/eddow/v-semantic#readme",
"devDependencies": {
"babel-core": "^6.26.0",
"babel-eslint": "^8.2.2",
"babel-core": "^6.26.3",
"babel-eslint": "^8.2.6",
"css-loader": "^1.0.1",
"eslint": "^4.19.1",
"eslint-config-standard": "^11.0.0",
"eslint-plugin-import": "^2.10.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-promise": "^3.7.0",
"eslint-plugin-standard": "^3.0.1",
"eslint-plugin-vue": "^4.4.0",
"fuse-box": "^3.1.3",
"typescript": "^2.8.1",
"vue-codemirror": "^4.0.4",
"vue-property-decorator": "^6.0.0",
"eslint-plugin-promise": "^3.8.0",
"eslint-plugin-standard": "^3.1.0",
"eslint-plugin-vue": "^4.7.1",
"fuse-box": "^3.6.0",
"jquery": "^3.3.1",
"source-map-loader": "^0.2.4",
"style-loader": "^0.23.1",
"ts-loader": "^5.3.0",
"typescript": "^2.9.2",
"vue-codemirror": "^4.0.6",
"vue-loader": "^15.4.2",
"vue-property-decorator": "^6.1.0",
"vue-router": "^3.0.1",
"vue-template-compiler": "^2.5.16",
"vue-template-es2015-compiler": "^1.6.0"
"vue-template-compiler": "^2.5.17",
"vue-template-es2015-compiler": "^1.6.0",
"webpack": "^4.25.1",
"webpack-cli": "^3.1.2",
"webpack-dts-bundle": "0.0.2",
"webpack-node-externals": "^1.7.2"
},
"dependencies": {
"ajv": "^6.4.0",
"ajv": "^6.5.5",
"node-sass": "^4.5.3",
"string": "^3.3.3",
"tslib": "^1.8.0",
"tslib": "^1.9.3",
"vue-hot-reload-api": "^2.2.0",
"vue-property-decorator": "^6.0.0",
"vue-resize-directive": "^1.0.0",
"vue-ripper": "^1.1.2"
"vue-resize-directive": "^1.1.4",
"vue-ripper": "^1.1.3"
},
"peerDependencies": {
"semantic-ui": "^2.3.1",
"vue": "^2.4.4"
"vue": "^2.5.17"
}
}
40 changes: 20 additions & 20 deletions semantic.json
@@ -1,22 +1,22 @@
{
"base": "semantic\\",
"paths": {
"source": {
"config": "src/theme.config",
"definitions": "src/definitions/",
"site": "src/site/",
"themes": "src/themes/"
},
"output": {
"packaged": "dist/",
"uncompressed": "dist/components/",
"compressed": "dist/components/",
"themes": "dist/themes/"
},
"clean": "dist/"
},
"permission": false,
"autoInstall": false,
"rtl": false,
"version": "2.3.1"
"base": "semantic\\",
"paths": {
"source": {
"config": "src/theme.config",
"definitions": "src/definitions/",
"site": "src/site/",
"themes": "src/themes/"
},
"output": {
"packaged": "dist/",
"uncompressed": "dist/components/",
"compressed": "dist/components/",
"themes": "dist/themes/"
},
"clean": "dist/"
},
"permission": false,
"autoInstall": false,
"rtl": false,
"version": "2.4.2"
}
2 changes: 1 addition & 1 deletion src/components/modal.vue
Expand Up @@ -65,7 +65,7 @@ export default class Modal extends Command.Commanded {
//command(command: string)
//command(command: string, params: any)
//command(resolve: function, reject: function)
command(command?: string|function, params?: any|function) {
command(command?: string|((v:any)=> any), params?: any|((v:any)=> any)) {
if('string'!== typeof command) {
if(this.promise) throw new Error('Modal invoked while being opened already')
Expand Down
3 changes: 2 additions & 1 deletion src/components/table/checkbox-column.vue
Expand Up @@ -21,12 +21,13 @@ import column from './column.vue'
import checkbox from '../checkbox.vue'
import {Ripper} from 'vue-ripper'
import table from './index.vue'
import { VueSemantic } from 'lib/module'
@Component({
components: {Ripper, checkbox},
mixins: [table.managedColumn]
})
export default class CheckboxColumn extends Vue {
export default class CheckboxColumn extends VueSemantic {
@Inject() modeled
@Prop({default: 'selected'}) prop: string
@Prop() header: string
Expand Down
2 changes: 1 addition & 1 deletion src/components/table/index.vue
Expand Up @@ -112,7 +112,7 @@ const generateRowId = idSpace('rw'), defaultRowHeight = 42;
compact: Boolean
}, {
components: {Pimp, Ripped},
mixins: [Modeled.extendOptions],
mixins: [(<any>Modeled).extendOptions],
directives: {resize}
})
export default class Table extends Vue {
Expand Down
3 changes: 2 additions & 1 deletion src/components/table/row-edit-column.vue
Expand Up @@ -39,12 +39,13 @@ import column from './column.vue'
import sButton from '../button.vue'
import {Ripper} from 'vue-ripper'
import table from './index.vue'
import { VueSemantic } from 'lib/module'
@Component({
components: {Ripper, sButton},
mixins: [table.managedColumn]
})
export default class RowEditColumn extends Vue {
export default class RowEditColumn extends VueSemantic {
@Inject() modeled
@Prop() header: string
@Prop() prop: string
Expand Down
1 change: 1 addition & 0 deletions src/components/tabs.vue
Expand Up @@ -39,6 +39,7 @@
import Vue from 'vue'
import {Component, Inject, Provide, Model, Prop, Watch, Emit} from 'vue-property-decorator'
import {Pimp, Ripped, Depot} from 'vue-ripper'
import $ from 'jquery'
var orders = {
tabsFirst: ['pimp', 'tabs', 'default'],
Expand Down
2 changes: 2 additions & 0 deletions src/directives/dimm-parts.ts
@@ -1,3 +1,5 @@
import $ from 'jquery'

export default function(el, binding, vnode, oldVnode) {
if(!('mouseIn' in vnode)) vnode.mouseIn = !!oldVnode.mouseIn;
el = $(el);
Expand Down
13 changes: 5 additions & 8 deletions src/directives/loading.ts
@@ -1,3 +1,5 @@
import $ from 'jquery'

export default {
bind(el, binding, vnode, oldVnode) {
var modifiers = Object.keys(binding.modifiers).join(' '),
Expand All @@ -10,14 +12,9 @@ export default {
if(binding.modifiers.blurring) dimmable.addClass('blurring');
},
update(el, binding, vnode, oldVnode) {
if('string'=== typeof binding.value)
$(el).data('dimmel')
.addClass('text')
.text(binding.value);
else
$(el).data('dimmel')
.removeClass('text')
.text('');
$(el).data('dimmel')
.addClass('text')
.text('string'=== typeof binding.value ? binding.value : '');
$(el).dimmer(binding.value?'show':'hide');
}
};
1 change: 1 addition & 0 deletions src/lib/module.ts
@@ -1,3 +1,4 @@
import $ from 'jquery'
import {Component} from 'vue-property-decorator'
import * as classed from './classed'
import Vue, {ComponentOptions} from 'vue'
Expand Down
14 changes: 11 additions & 3 deletions test/src/routes.ts
Expand Up @@ -2,13 +2,21 @@
const MenuContainer = {
template: `<router-view></router-view>`
}; //used for route-group, menu groups
import * as comps from './routes/*.vue'
import Accordion from './routes/accordion.vue'
import Buttons from './routes/buttons.vue'
import Form from './routes/form.vue'
import Inputs from './routes/inputs.vue'
import Progress from './routes/progress.vue'
import Sidebars from './routes/sidebars.vue'
import Table from './routes/table.vue'
import Tabs from './routes/tabs.vue'
const comps = {Accordion, Buttons, Form, Inputs, Progress, Sidebars, Table, Tabs}
const routes = [];
for(let i in comps) {
let name = /test\/src\/routes\/(.*).vue$/.exec(i)[1];
let name = i.toLowerCase();
routes.push({
name, path: '/'+name,
menu: name.substr(0,1).toUpperCase()+name.substr(1),
menu: i,
component: comps[i].default
});
}
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Expand Up @@ -23,7 +23,7 @@
"lib/*": ["./src/lib/*"],
"directives/*": ["./src/directives/*"],
"components/*": ["./src/components/*"],
"v-semantic": ["./dist/v-semantic"]
"v-semantic": ["./src/v-semantic"]
}
},
"exclude": [
Expand Down
3 changes: 3 additions & 0 deletions webpack.config.js
Expand Up @@ -25,6 +25,9 @@ module.exports = {
out: 'v-semantic.d.ts',
removeSource: true
}),*/
new webpack.ProvidePlugin({
$: 'jquery'
}),
new VueLoader.VueLoaderPlugin()
],
externals: [
Expand Down

0 comments on commit bbc7b26

Please sign in to comment.