Skip to content

Commit

Permalink
replace engine url with unpack protocol
Browse files Browse the repository at this point in the history
  • Loading branch information
nantas committed Apr 14, 2016
1 parent e726a77 commit 3719f97
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion extensions/cocostudio/CCStudioComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var StudioComponent = cc.Class({
extends: cc.Component,

editor: CC_EDITOR && {
inspector: 'app://engine/extensions/cocostudio/editor/studio-component.html'
inspector: 'unpack://engine/extensions/cocostudio/editor/studio-component.html'
},

properties: CC_EDITOR && {
Expand Down
2 changes: 1 addition & 1 deletion extensions/spine/editor/spine-asset.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<template>
<inspector-meta-header
target="[[target]]"
icon="app://engine/extensions/spine/editor/spine-asset.png"
icon="unpack://engine/extensions/spine/editor/spine-asset.png"
dirty="{{dirty}}"
>
</inspector-meta-header>
Expand Down
7 changes: 2 additions & 5 deletions test/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,20 @@ var Path = require('fire-path');
describe('core level', function () {
it ('should success', function () {
// simple init
Editor.require( 'app://engine-framework/src' );
Editor.require( 'unpack://engine-framework/src' );

// simple init
if ( !Editor.assets ) Editor.assets = {};
if ( !Editor.metas ) Editor.metas = {};
if ( !Editor.inspectors ) Editor.inspectors = {};

// init engine-framework
Editor.require('app://engine-framework');

// init asset-db
var AssetDB = Editor.require('app://asset-db');
Editor.assetdb = new AssetDB({
'cwd': Path.join( __dirname, 'playground' ),
'library': 'library',
});

Editor.require( 'app://engine' );
Editor.require( 'unpack://engine' );
});
});
4 changes: 2 additions & 2 deletions test/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
</script>

<!-- cocos html5 -->
<script type="text/javascript" src="app://engine/bin/cocos2d-js.js"></script>
<script type="text/javascript" src="unpack://engine/bin/cocos2d-js.js"></script>
</head>

<body>
<h1>Testing Cocos2d-JS</h1>
<canvas id="gameCanvas" width="400" height="400"></canvas>

<script type="text/javascript" src="app://engine/test/page/index.js"></script>
<script type="text/javascript" src="unpack://engine/test/page/index.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion test/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ describe('test cocos', function () {
show: true,
resizable: false,
});
win.load('app://engine/test/page.html');
win.load('unpack://engine/test/page.html');
});
});
4 changes: 1 addition & 3 deletions test/page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ window.getAssetsPath = function () {
};


// engine framework
Editor.require('app://engine-framework/src');

Editor.isRuntime = true;

Expand All @@ -23,7 +21,7 @@ Editor.assets = {};
Editor.inspectors = {};

// cocos
Editor.require('app://engine');
Editor.require('unpack://engine');

// init asset library
cc.AssetLibrary.init({
Expand Down

0 comments on commit 3719f97

Please sign in to comment.