diff --git a/cocos2d/core/load-pipeline/loading-items.js b/cocos2d/core/load-pipeline/loading-items.js index f7b2950e6a..ced9e16ade 100644 --- a/cocos2d/core/load-pipeline/loading-items.js +++ b/cocos2d/core/load-pipeline/loading-items.js @@ -30,7 +30,8 @@ var JS = require('../platform/js'); * LoadingItems is the manager of items in pipeline. * It hold a map of items, each entry in the map is a url to object key value pair. * Each item always contains the following property: - * - src: The url + * - id: The identification of the item, usually it's identical to url + * - url: The url * - type: The type, it's the extension name of the url by default, could be specified manually too * - error: The error happened in pipeline will be stored in this property * - content: The content processed by the pipeline, the final result will also be stored in this property diff --git a/cocos2d/core/platform/CCView.js b/cocos2d/core/platform/CCView.js index 93f65141ce..93bc7092f6 100644 --- a/cocos2d/core/platform/CCView.js +++ b/cocos2d/core/platform/CCView.js @@ -330,6 +330,7 @@ var View = cc._Class.extend({ _adjustViewportMeta: function () { if (this._isAdjustViewPort) { this._setViewportMeta(__BrowserGetter.meta, false); + this._isAdjustViewPort = false; } },