Skip to content

Commit

Permalink
Merge branch 'master' of github.com:gameclosure/devkit-core into develop
Browse files Browse the repository at this point in the history
* 'master' of github.com:gameclosure/devkit-core:
  fix errors handling boolean keys in iosIcons
  Release 2.2.0
  Release 2.1.4
  • Loading branch information
Martin Hunt committed Mar 13, 2015
2 parents 3220ac5 + 3199fa5 commit 45836ac
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion modules/native-ios
2 changes: 1 addition & 1 deletion modules/timestep
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "devkit-core",
"author": "Game Closure",
"description": "DevKit client API",
"version": "2.0.15",
"description": "devkit engine",
"version": "2.1.4",
"repository": {
"type": "git",
"url": "http://github.com/gameclosure/gcapi/gcapi.git"
"url": "http://github.com/gameclosure/devkit-core.git"
},
"dependencies": {
"cli-color": "^0.3.2",
Expand Down
2 changes: 2 additions & 0 deletions src/build/browser/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ exports.GameHTML = Class(function () {
var closestIcon;

for (var size in iosIcons) {
if (typeof iosIcons[size] != 'string') { continue; }

var intSize = parseInt(size);
var icon = path.join(app.paths.root, iosIcons[size]);
if (!fs.existsSync(icon)) {
Expand Down
14 changes: 6 additions & 8 deletions src/clientapi/native/Window.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,22 @@
* along with the Game Closure SDK. If not, see <http://mozilla.org/MPL/2.0/>.
*/

"use import";

import lib.PubSub;

var _evts = new lib.PubSub();
module.exports = new lib.PubSub();

window.open = window.open || window.setLocation;

window.addEventListener = function (evtName, cb, isBubble) {
_evts.subscribe(evtName, window, cb);
module.exports.on(evtName, cb);
}

window.removeEventListener = function (evtName, cb, isBubble) {
_evts.unsubscribe(evtName, window, cb);
module.exports.removeListener(evtName, cb);
}

window.__fireEvent = function (name, evt) {
if (!evt) { evt = {}; }
evt.type = name;
_evts.publish(name, evt);
if (!evt) { evt = {}; }
evt.type = name;
module.exports.publish(name, evt);
}

0 comments on commit 45836ac

Please sign in to comment.