From a822f07fcb4fa5be2de898117dff95a1fe98d5a2 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Mon, 9 Jan 2017 14:26:06 +0800 Subject: [PATCH] extract cc._RF for v1.4 --- cocos2d/core/platform/requiring-frame.js | 67 +++++++++++++----------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/cocos2d/core/platform/requiring-frame.js b/cocos2d/core/platform/requiring-frame.js index 7cc010c3d2..9af9c9946a 100644 --- a/cocos2d/core/platform/requiring-frame.js +++ b/cocos2d/core/platform/requiring-frame.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2013-2017 Chukong Technologies Inc. http://www.cocos.com @@ -25,41 +25,48 @@ var requiringFrames = []; // the requiring frame infos -cc._RFpush = function (module, uuid, script) { - if (arguments.length === 2) { - script = uuid; - uuid = ''; - } - requiringFrames.push({ - uuid: uuid, - script: script, - module: module, - exports: module.exports, // original exports - beh: null - }); -}; - -cc._RFpop = function () { - var frameInfo = requiringFrames.pop(); - // check exports - var module = frameInfo.module; - var exports = module.exports; - if (exports === frameInfo.exports) { - for (var anyKey in exports) { - // exported - return; +cc._RF = { + push: function (module, uuid, script) { + if (arguments.length === 2) { + script = uuid; + uuid = ''; } - // auto export component + requiringFrames.push({ + uuid: uuid, + script: script, + module: module, + exports: module.exports, // original exports + beh: null + }); + }, + pop: function () { + var frameInfo = requiringFrames.pop(); + // check exports + var module = frameInfo.module; + var exports = module.exports; + if (exports === frameInfo.exports) { + for (var anyKey in exports) { + // exported + return; + } + // auto export component module.exports = exports = frameInfo.beh; + } + }, + peek: function () { + return requiringFrames[requiringFrames.length - 1]; } }; -cc._RFpeek = function () { - return requiringFrames[requiringFrames.length - 1]; -}; - if (CC_EDITOR) { - cc._RFreset = function () { + cc._RF.reset = function () { requiringFrames = []; }; } + +cc._RFpush = cc._RF.push; +cc._RFpop = cc._RF.pop; +cc._RFpeek = cc._RF.peek; +if (CC_EDITOR) { + cc._RFreset = cc._RF.reset; +}