Skip to content

Commit 106be8b

Browse files
committed
🐛fixed sprite3.x
1 parent 24047e2 commit 106be8b

File tree

9 files changed

+12259
-11267
lines changed

9 files changed

+12259
-11267
lines changed

dist/sprite-vue.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9791,7 +9791,7 @@ function createElement(tagName, vnode) {
97919791
if (tagName === 'scene') {
97929792
var _elm = document.createElement('div');
97939793
if (attrs.id) _elm.id = attrs.id;
9794-
if (!vnode.data.ref) vnode.data.ref = 'scene';
9794+
if (!spritejs__WEBPACK_IMPORTED_MODULE_5__["isSpriteNode"] && !vnode.data.ref) vnode.data.ref = 'scene';
97959795
if (!('useDocumentCSS' in attrs)) attrs.useDocumentCSS = true;
97969796
var scene = void 0;
97979797
if (isNewVersion) {
@@ -13677,7 +13677,7 @@ function locateNode(vnode) {
1367713677
var style = getStyle(el);
1367813678
if (el instanceof BaseSprite) {
1367913679
var states = style.states;
13680-
if (!value && states.hide) {
13680+
if (!value && states && states.hide) {
1368113681
var beforeHide = { __default: true };
1368213682
if (states.beforeShow) {
1368313683
babel_runtime_core_js_object_keys__WEBPACK_IMPORTED_MODULE_0___default()(states.beforeShow).forEach(function (key) {
@@ -13692,7 +13692,7 @@ function locateNode(vnode) {
1369213692
}
1369313693
if (!value) {
1369413694
style.display = 'none';
13695-
style.quietSet('state', 'hide');
13695+
if (style.quietSet) style.quietSet('state', 'hide');
1369613696
}
1369713697
// if (value) el.show()
1369813698
} else {

dist/sprite-vue.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/js/sprite-next.js

Lines changed: 12243 additions & 11252 deletions
Large diffs are not rendered by default.

example/test-keyboard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
}
3030
},
3131
mounted () {
32-
this.$refs.scene.delegateEvent('keydown', document)
32+
// this.$refs.scene.delegateEvent('keydown', document)
3333
},
3434
methods: {
3535
keydown (evt) {

example/test.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width">
66
<title>Example</title>
7-
<script src="http://unpkg.com/spritejs/dist/spritejs.js"></script>
7+
<!-- <script src="http://unpkg.com/[email protected]/dist/spritejs.js"></script> -->
8+
<script src="/js/sprite-next.js"></script>
89
<script src="/js/sprite-vue.js"></script>
910
<!-- <script src="/js/sprite-vue-debug.js"></script> -->
1011
<style>

example/test2.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@
2323
Vue.component('my-scene', {
2424
data () {
2525
return {
26-
viewport: [600, 600],
26+
width: 1200,
27+
height: 1200,
2728
ccc: {
2829
bgcolor: 'blue'
2930
},
3031
state: true
3132
}
3233
},
3334
mounted () {
34-
// console.log(this.$refs)
35+
console.log(this.$refs)
3536
this.ccc.bgcolor = 'red'
3637
// this.attrs = { ... this.attrs }
3738
setTimeout(() => {
@@ -42,8 +43,8 @@
4243
}, 2000)
4344
},
4445
template: `
45-
<scene id="container" :viewport=viewport>
46-
<layer id="fglayer">
46+
<scene id="container" :width=width :height=height ref="bbb">
47+
<layer id="fglayer" ref="aaa">
4748
<sprite :attrs="ccc" :size="[100, 100]" :pos="[200, 200]"></sprite>
4849
<group>
4950
<sprite bgcolor="green" :size="[100, 100]" :pos="[400, 200]"></sprite>

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sprite-vue",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "A Vue.js project for SpriteJS",
55
"author": "akira-cn <[email protected]>",
66
"main": "src/index.js",
@@ -14,7 +14,6 @@
1414
},
1515
"dependencies": {
1616
"babel-runtime": "^6.26.0",
17-
"spritejs": "^2.29.6",
1817
"vue": "^2.5.17"
1918
},
2019
"devDependencies": {

src/web/runtime/directives/show.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default {
2828
const style = getStyle(el)
2929
if (el instanceof BaseSprite) {
3030
const states = style.states
31-
if (!value && states.hide) {
31+
if (!value && states && states.hide) {
3232
const beforeHide = { __default: true }
3333
if (states.beforeShow) {
3434
Object.keys(states.beforeShow).forEach((key) => {
@@ -43,7 +43,7 @@ export default {
4343
}
4444
if (!value) {
4545
style.display = 'none'
46-
style.quietSet('state', 'hide')
46+
if (style.quietSet) style.quietSet('state', 'hide')
4747
}
4848
// if (value) el.show()
4949
} else {

src/web/runtime/node-ops.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function createElement (tagName: string, vnode: VNode): Element {
4040
if (tagName === 'scene') {
4141
const elm = document.createElement('div')
4242
if (attrs.id) elm.id = attrs.id
43-
if (!vnode.data.ref) vnode.data.ref = 'scene'
43+
if (!spritejs.isSpriteNode && !vnode.data.ref) vnode.data.ref = 'scene'
4444
if (!('useDocumentCSS' in attrs)) attrs.useDocumentCSS = true
4545
let scene
4646
if (isNewVersion) {

0 commit comments

Comments
 (0)