From 78f152477300ce7607327b289cc77a977a7a9c6d Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Thu, 28 Jul 2016 17:32:09 +0800 Subject: [PATCH 1/3] WebView visible --- cocos2d/core/webview/CCSGWebView.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cocos2d/core/webview/CCSGWebView.js b/cocos2d/core/webview/CCSGWebView.js index f869d7a151..93b68907e1 100644 --- a/cocos2d/core/webview/CCSGWebView.js +++ b/cocos2d/core/webview/CCSGWebView.js @@ -188,6 +188,11 @@ _ccsg.WebView = _ccsg.Node.extend(/** @lends _ccsg.WebView# */{ this._renderCmd.removeDom(); this.stopAllActions(); this.unscheduleAllCallbacks(); + }, + + setVisible: function ( visible ) { + _ccsg.Node.prototype.setVisible.call(this, visible); + this._renderCmd.updateVisibility(); } }); @@ -318,6 +323,7 @@ _ccsg.WebView.EventType = { var self = this; var cb = function(){ self._loaded = true; + self.updateVisibility(); iframe.removeEventListener("load", cb); }; iframe.addEventListener("load", cb); @@ -375,4 +381,15 @@ _ccsg.WebView.EventType = { this._div = null; }; + proto.updateVisibility = function () { + var node = this._node; + if (!this._div) return; + var div = this._div; + if (node.visible) { + div.style.visibility = 'visible'; + } else { + div.style.visibility = 'hidden'; + } + }; + })(_ccsg.WebView._polyfill); From 31e7000d8e506d6bd12383542054be456ceebcbe Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Thu, 28 Jul 2016 18:21:54 +0800 Subject: [PATCH 2/3] Remove dom element --- cocos2d/core/editbox/CCSGEditBox.js | 9 +++++++++ cocos2d/core/videoplayer/CCSGVideoPlayer.js | 11 +++++++++++ cocos2d/core/webview/CCSGWebView.js | 12 ++++++++++++ 3 files changed, 32 insertions(+) diff --git a/cocos2d/core/editbox/CCSGEditBox.js b/cocos2d/core/editbox/CCSGEditBox.js index 522d128799..517d76ce8f 100644 --- a/cocos2d/core/editbox/CCSGEditBox.js +++ b/cocos2d/core/editbox/CCSGEditBox.js @@ -542,8 +542,17 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; var editBox = this._edTxt; if (node.visible) { editBox.style.visibility = 'visible'; + cc.container.appendChild(editBox); } else { editBox.style.visibility = 'hidden'; + var hasChild = false; + if('contains' in cc.container) { + hasChild = cc.container.contains(editBox); + }else { + hasChild = cc.container.compareDocumentPosition(editBox) % 16; + } + if(hasChild) + cc.container.removeChild(editBox); } }; diff --git a/cocos2d/core/videoplayer/CCSGVideoPlayer.js b/cocos2d/core/videoplayer/CCSGVideoPlayer.js index 3c6d984182..dcbbcd26ed 100644 --- a/cocos2d/core/videoplayer/CCSGVideoPlayer.js +++ b/cocos2d/core/videoplayer/CCSGVideoPlayer.js @@ -383,9 +383,20 @@ _ccsg.VideoPlayer.EventType = { var video = this._video; if (node.visible) { video.style.visibility = 'visible'; + cc.container.appendChild(video); } else { video.style.visibility = 'hidden'; video.pause(); + if(video){ + var hasChild = false; + if('contains' in cc.container) { + hasChild = cc.container.contains(video); + }else { + hasChild = cc.container.compareDocumentPosition(video) % 16; + } + if(hasChild) + cc.container.removeChild(video); + } } }; diff --git a/cocos2d/core/webview/CCSGWebView.js b/cocos2d/core/webview/CCSGWebView.js index 93b68907e1..d58c7bb983 100644 --- a/cocos2d/core/webview/CCSGWebView.js +++ b/cocos2d/core/webview/CCSGWebView.js @@ -238,6 +238,7 @@ _ccsg.WebView.EventType = { _ccsg.WebView.RenderCmd = function(node){ RenderCmd.call(this, node); + this._parent = null; this._div = null; this._iframe = null; this._listener = null; @@ -387,8 +388,19 @@ _ccsg.WebView.EventType = { var div = this._div; if (node.visible) { div.style.visibility = 'visible'; + cc.container.appendChild(div); } else { div.style.visibility = 'hidden'; + if(div){ + var hasChild = false; + if('contains' in cc.container) { + hasChild = cc.container.contains(div); + }else { + hasChild = cc.container.compareDocumentPosition(div) % 16; + } + if(hasChild) + cc.container.removeChild(div); + } } }; From 94c695faf2d1616609d8beaf952ec55f28c127ae Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Fri, 29 Jul 2016 13:38:33 +0800 Subject: [PATCH 3/3] cc.container -> cc.game.container; --- cocos2d/core/editbox/CCSGEditBox.js | 22 ++++++++++----------- cocos2d/core/videoplayer/CCSGVideoPlayer.js | 22 ++++++++++----------- cocos2d/core/webview/CCSGWebView.js | 22 ++++++++++----------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/cocos2d/core/editbox/CCSGEditBox.js b/cocos2d/core/editbox/CCSGEditBox.js index 517d76ce8f..1ce15d927d 100644 --- a/cocos2d/core/editbox/CCSGEditBox.js +++ b/cocos2d/core/editbox/CCSGEditBox.js @@ -515,7 +515,7 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; scaleX /= dpr; scaleY /= dpr; - var container = cc.container; + var container = cc.game.container; var a = t.a * scaleX, b = t.b, c = t.c, d = t.d * scaleY; var offsetX = container && container.style.paddingLeft && parseInt(container.style.paddingLeft); @@ -542,17 +542,17 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; var editBox = this._edTxt; if (node.visible) { editBox.style.visibility = 'visible'; - cc.container.appendChild(editBox); + cc.game.container.appendChild(editBox); } else { editBox.style.visibility = 'hidden'; var hasChild = false; - if('contains' in cc.container) { - hasChild = cc.container.contains(editBox); + if('contains' in cc.game.container) { + hasChild = cc.game.container.contains(editBox); }else { - hasChild = cc.container.compareDocumentPosition(editBox) % 16; + hasChild = cc.game.container.compareDocumentPosition(editBox) % 16; } if(hasChild) - cc.container.removeChild(editBox); + cc.game.container.removeChild(editBox); } }; @@ -973,20 +973,20 @@ _ccsg.EditBox.KeyboardReturnType = KeyboardReturnType; }; proto._addDomInputControl = function () { - cc.container.appendChild(this._edTxt); + cc.game.container.appendChild(this._edTxt); }; proto._removeDomInputControl = function () { var editBox = this._edTxt; if(editBox){ var hasChild = false; - if('contains' in cc.container) { - hasChild = cc.container.contains(editBox); + if('contains' in cc.game.container) { + hasChild = cc.game.container.contains(editBox); }else { - hasChild = cc.container.compareDocumentPosition(editBox) % 16; + hasChild = cc.game.container.compareDocumentPosition(editBox) % 16; } if(hasChild) - cc.container.removeChild(editBox); + cc.game.container.removeChild(editBox); } this._edTxt = null; }; diff --git a/cocos2d/core/videoplayer/CCSGVideoPlayer.js b/cocos2d/core/videoplayer/CCSGVideoPlayer.js index dcbbcd26ed..9ec0d6287f 100644 --- a/cocos2d/core/videoplayer/CCSGVideoPlayer.js +++ b/cocos2d/core/videoplayer/CCSGVideoPlayer.js @@ -270,7 +270,7 @@ _ccsg.VideoPlayer.EventType = { scaleX /= dpr; scaleY /= dpr; - var container = cc.container; + var container = cc.game.container; var a = t.a * scaleX, b = t.b, c = t.c, d = t.d * scaleY; var offsetX = container && container.style.paddingLeft && parseInt(container.style.paddingLeft); @@ -383,19 +383,19 @@ _ccsg.VideoPlayer.EventType = { var video = this._video; if (node.visible) { video.style.visibility = 'visible'; - cc.container.appendChild(video); + cc.game.container.appendChild(video); } else { video.style.visibility = 'hidden'; video.pause(); if(video){ var hasChild = false; - if('contains' in cc.container) { - hasChild = cc.container.contains(video); + if('contains' in cc.game.container) { + hasChild = cc.game.container.contains(video); }else { - hasChild = cc.container.compareDocumentPosition(video) % 16; + hasChild = cc.game.container.compareDocumentPosition(video) % 16; } if(hasChild) - cc.container.removeChild(video); + cc.game.container.removeChild(video); } } }; @@ -408,20 +408,20 @@ _ccsg.VideoPlayer.EventType = { video.className = "cocosVideo"; video.setAttribute('preload', true); this._video = video; - cc.container.appendChild(video); + cc.game.container.appendChild(video); }; proto.removeDom = function () { var video = this._video; if(video){ var hasChild = false; - if('contains' in cc.container) { - hasChild = cc.container.contains(video); + if('contains' in cc.game.container) { + hasChild = cc.game.container.contains(video); }else { - hasChild = cc.container.compareDocumentPosition(video) % 16; + hasChild = cc.game.container.compareDocumentPosition(video) % 16; } if(hasChild) - cc.container.removeChild(video); + cc.game.container.removeChild(video); } this._video = null; this._url = ""; diff --git a/cocos2d/core/webview/CCSGWebView.js b/cocos2d/core/webview/CCSGWebView.js index d58c7bb983..7973a86a1f 100644 --- a/cocos2d/core/webview/CCSGWebView.js +++ b/cocos2d/core/webview/CCSGWebView.js @@ -296,7 +296,7 @@ _ccsg.WebView.EventType = { scaleX /= dpr; scaleY /= dpr; - var container = cc.container; + var container = cc.game.container; var a = t.a * scaleX, b = t.b, c = t.c, d = t.d * scaleY; var offsetX = container && container.style.paddingLeft && parseInt(container.style.paddingLeft); @@ -358,7 +358,7 @@ _ccsg.WebView.EventType = { this._div.style.width = contentSize.width + "px"; this._div.style.overflow = "scroll"; this._div.style.border = "none"; - cc.container.appendChild(this._div); + cc.game.container.appendChild(this._div); }; proto.createNativeControl = function () { @@ -371,13 +371,13 @@ _ccsg.WebView.EventType = { var div = this._div; if(div){ var hasChild = false; - if('contains' in cc.container) { - hasChild = cc.container.contains(div); + if('contains' in cc.game.container) { + hasChild = cc.game.container.contains(div); }else { - hasChild = cc.container.compareDocumentPosition(div) % 16; + hasChild = cc.game.container.compareDocumentPosition(div) % 16; } if(hasChild) - cc.container.removeChild(div); + cc.game.container.removeChild(div); } this._div = null; }; @@ -388,18 +388,18 @@ _ccsg.WebView.EventType = { var div = this._div; if (node.visible) { div.style.visibility = 'visible'; - cc.container.appendChild(div); + cc.game.container.appendChild(div); } else { div.style.visibility = 'hidden'; if(div){ var hasChild = false; - if('contains' in cc.container) { - hasChild = cc.container.contains(div); + if('contains' in cc.game.container) { + hasChild = cc.game.container.contains(div); }else { - hasChild = cc.container.compareDocumentPosition(div) % 16; + hasChild = cc.game.container.compareDocumentPosition(div) % 16; } if(hasChild) - cc.container.removeChild(div); + cc.game.container.removeChild(div); } } };