• R/O
  • SSH
  • HTTPS

dropanddraw: コミット


コミットメタ情報

リビジョン11 (tree)
日時2016-12-19 19:11:56
作者takoyaki_umaaaa

ログメッセージ

変更サマリ

差分

--- trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppxManifest.xml (revision 10)
+++ trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppxManifest.xml (revision 11)
@@ -24,7 +24,13 @@
2424 <Application Id="App" StartPage="index.html">
2525 <uap:VisualElements DisplayName="DropAndDraw" Description="DropAndDraw" BackgroundColor="transparent" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
2626 <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png"></uap:DefaultTile>
27- <uap:SplashScreen Image="images\splashscreen.png" />
27+ <uap:SplashScreen Image="images\splashscreen.png" BackgroundColor="orange" />
28+ <uap:InitialRotationPreference>
29+ <uap:Rotation Preference="portrait" />
30+ <uap:Rotation Preference="landscape" />
31+ <uap:Rotation Preference="portraitFlipped" />
32+ <uap:Rotation Preference="landscapeFlipped" />
33+ </uap:InitialRotationPreference>
2834 </uap:VisualElements>
2935 <uap:ApplicationContentUriRules>
3036 <uap:Rule Match="https://*.facebook.com" Type="include" WindowsRuntimeAccess="none" />
--- trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppX/js/main.js (revision 10)
+++ trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppX/js/main.js (revision 11)
@@ -64,15 +64,16 @@
6464
6565 // ブラウザ起動
6666 if ('function' !== typeof window.checkApplication) {
67- console.log('ブラウザ側起動');
68- // onLoadイベントを待つ
67+ console.log('ブラウザ起動');
68+ // onLoadイベントを待ってから処理開始
6969 window.onload = function(){
7070 console.log("onload");
71- window.ui_thread_main();
71+ window.ui_thread_main();
7272 };
7373 }
7474 // アプリ起動
7575 else {
76- console.log('アプリ側起動');
76+ console.log('アプリ起動');
77+ // visibilitychangeイベントを待ってから処理開始
7778 window.application_winjs_main();
7879 }
--- trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppX/js/DispObj.js (revision 10)
+++ trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppX/js/DispObj.js (revision 11)
@@ -188,14 +188,24 @@
188188 return new rectData(0, 0, destW, destH);
189189 }
190190 renderCreate() {
191-// this.DOMobject.style.border = "1px solid black"; // 指定するI/Fが必要
192- if (null != this.text) this.DOMobject.innerHTML = this.text;
193-// this.DOMobject.style.position = "absolute"; // DispObj CSS classで指定
191+ let isiFrame = false;
194192
193+ if (null != this.text){
194+ isiFrame = (0 <= this.text.indexOf('iframe'));
195+ if (isiFrame) {
196+ this.DOMbase.style.width = "auto";
197+ this.DOMbase.style.height = "auto";
198+ this.text += '<div style="position:absolute; left:0; top:0; width:100%; height:100%;background-color:red;opacity:0.4;"></div>';
199+ }
200+ this.DOMobject.innerHTML = this.text;
201+ }
202+
195203 this.DOMbase.style.left = this.x.toString() + "px";
196204 this.DOMbase.style.top = this.y.toString() + "px";
197- this.DOMbase.style.width = this.width.toString() + "px";
198- this.DOMbase.style.height = this.height.toString() + "px";
205+ if (!isiFrame) {
206+ this.DOMbase.style.width = this.width.toString() + "px";
207+ this.DOMbase.style.height = this.height.toString() + "px";
208+ }
199209 window.frameArea.DOMobject.appendChild(this.DOMbase);
200210
201211 this.debuglog("renderCreate() left=" + this.DOMbase.style.left
--- trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppX/js/ObjIDMgr.js (revision 10)
+++ trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppX/js/ObjIDMgr.js (revision 11)
@@ -5,7 +5,6 @@
55 // ・DispObjへのobjid割り当て
66 // ・objidから実体への変換
77 // ・DispObjへのcommand処理要求 (振り分け)
8-// ×【やめ】DispObjの描画関数呼び出し
98
109 class CObjIDMgr {
1110 constructor() {
--- trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppX/AppxManifest.xml (revision 10)
+++ trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppX/AppxManifest.xml (revision 11)
@@ -24,7 +24,13 @@
2424 <Application Id="App" StartPage="index.html">
2525 <uap:VisualElements DisplayName="DropAndDraw" Description="DropAndDraw" BackgroundColor="transparent" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
2626 <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png"></uap:DefaultTile>
27- <uap:SplashScreen Image="images\splashscreen.png" />
27+ <uap:SplashScreen Image="images\splashscreen.png" BackgroundColor="orange" />
28+ <uap:InitialRotationPreference>
29+ <uap:Rotation Preference="portrait" />
30+ <uap:Rotation Preference="landscape" />
31+ <uap:Rotation Preference="portraitFlipped" />
32+ <uap:Rotation Preference="landscapeFlipped" />
33+ </uap:InitialRotationPreference>
2834 </uap:VisualElements>
2935 <uap:ApplicationContentUriRules>
3036 <uap:Rule Match="https://*.facebook.com" Type="include" WindowsRuntimeAccess="none" />
--- trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppX/css/default.css (revision 10)
+++ trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/bin/x64/Debug/AppX/css/default.css (revision 11)
@@ -10,19 +10,25 @@
1010 -o-box-sizing: border-box;
1111 -ms-box-sizing: border-box;
1212 box-sizing: border-box;
13- -webkit-user-select: none;
13+/* -webkit-user-select: none;
1414 -khtml-user-select: none;
1515 -moz-user-select: none;
1616 user-select: none;
17+*/
1718 font-family: 游明朝, YuMincho, ヒラギノ明朝 ProN W3, Hiragino Mincho ProN, HG明朝E, MS P明朝, MS 明朝, serif;
1819 -webkit-font-smoothing: antialiased;
20+
1921 /* -webkit-overflow-scrolling: touch; */
2022 }
2123
2224 body{
23- overflow: scroll; /* WinJSが勝手にhiddenにするため */
24- -ms-content-zooming: unset; /* WinJSが勝手にzoom禁止にするため */
25+ overflow: scroll; /* WinJSが勝手にhiddenにするため */
26+ -ms-content-zooming: zoom; /* WinJSが勝手にzoom禁止にするため */
2527 -ms-content-zoom-limit: 10% 50%;
28+
29+ background: #f1e767;
30+ background: linear-gradient(135deg, hsla(56,83%,67%,1) 0%,hsla(37,99%,64%,1) 100%);
31+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f1e767', endColorstr='#feb645',GradientType=1 );
2632 }
2733
2834 .buttonstyle {
@@ -55,7 +61,6 @@
5561 width: 100%; height: 100%;
5662 border: none;
5763 margin: 0; padding: 0;
58- background-color: gainsboro;
5964 }
6065
6166 /* キャンバス要素の定義 */
@@ -62,7 +67,7 @@
6267 #DispField{
6368 display:block;
6469 position:relative;
65- width:1000px; height:500px;
70+ width:500px; height:500px;
6671 border: none;
6772 margin: 0; padding: 0;
6873 background-color: transparent;
--- trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/css/default.css (revision 10)
+++ trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/css/default.css (revision 11)
@@ -10,19 +10,25 @@
1010 -o-box-sizing: border-box;
1111 -ms-box-sizing: border-box;
1212 box-sizing: border-box;
13- -webkit-user-select: none;
13+/* -webkit-user-select: none;
1414 -khtml-user-select: none;
1515 -moz-user-select: none;
1616 user-select: none;
17+*/
1718 font-family: 游明朝, YuMincho, ヒラギノ明朝 ProN W3, Hiragino Mincho ProN, HG明朝E, MS P明朝, MS 明朝, serif;
1819 -webkit-font-smoothing: antialiased;
20+
1921 /* -webkit-overflow-scrolling: touch; */
2022 }
2123
2224 body{
23- overflow: scroll; /* WinJSが勝手にhiddenにするため */
24- -ms-content-zooming: unset; /* WinJSが勝手にzoom禁止にするため */
25+ overflow: scroll; /* WinJSが勝手にhiddenにするため */
26+ -ms-content-zooming: zoom; /* WinJSが勝手にzoom禁止にするため */
2527 -ms-content-zoom-limit: 10% 50%;
28+
29+ background: #f1e767;
30+ background: linear-gradient(135deg, hsla(56,83%,67%,1) 0%,hsla(37,99%,64%,1) 100%);
31+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f1e767', endColorstr='#feb645',GradientType=1 );
2632 }
2733
2834 .buttonstyle {
@@ -55,7 +61,6 @@
5561 width: 100%; height: 100%;
5662 border: none;
5763 margin: 0; padding: 0;
58- background-color: gainsboro;
5964 }
6065
6166 /* キャンバス要素の定義 */
@@ -62,7 +67,7 @@
6267 #DispField{
6368 display:block;
6469 position:relative;
65- width:1000px; height:500px;
70+ width:500px; height:500px;
6671 border: none;
6772 margin: 0; padding: 0;
6873 background-color: transparent;
--- trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/js/main.js (revision 10)
+++ trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/js/main.js (revision 11)
@@ -64,15 +64,16 @@
6464
6565 // ブラウザ起動
6666 if ('function' !== typeof window.checkApplication) {
67- console.log('ブラウザ側起動');
68- // onLoadイベントを待つ
67+ console.log('ブラウザ起動');
68+ // onLoadイベントを待ってから処理開始
6969 window.onload = function(){
7070 console.log("onload");
71- window.ui_thread_main();
71+ window.ui_thread_main();
7272 };
7373 }
7474 // アプリ起動
7575 else {
76- console.log('アプリ側起動');
76+ console.log('アプリ起動');
77+ // visibilitychangeイベントを待ってから処理開始
7778 window.application_winjs_main();
7879 }
--- trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/js/ObjIDMgr.js (revision 10)
+++ trunk/src/DropAndDraw/DropAndDraw/DropAndDraw/js/ObjIDMgr.js (revision 11)
@@ -5,7 +5,6 @@
55 // ・DispObjへのobjid割り当て
66 // ・objidから実体への変換
77 // ・DispObjへのcommand処理要求 (振り分け)
8-// ×【やめ】DispObjの描画関数呼び出し
98
109 class CObjIDMgr {
1110 constructor() {
旧リポジトリブラウザで表示