Skip to content

업데이트 된것 머지 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Songhun wants to merge 2 commits into
base: master
Choose a base branch
from
Open

업데이트 된것 머지 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86026b4
Fixed coding bug
Songhun Oct 28, 2012
2753702
Fixed Desgin of Layer
Songhun Oct 31, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<script type="text/javascript" src="static/jquery.js"></script>
<script type="text/javascript" src="static/underscore.js"></script>
<script type="text/javascript" src="static/backbone.js"></script>
<script type="text/javascript" src="static/cbox.sdk.js"></script>
<script type="text/javascript" src="static/backbone.tv.keyevent.js"></script>
<script type="text/javascript" src="static/cbox.sdk.js"></script>
<script type="text/javascript" src="static/game-launcher.js"></script>
<script type="text/javascript" src="static/homescreen.js"></script>
<script type="text/javascript" src="static/main.js"></script>
Expand All @@ -17,11 +17,11 @@

<div id="osx-container">
<div id="osx-modal-content">
<div id="osx-modal-title">Connect Game Controllers</div>
<div id="osx-modal-title">게임 컨트롤러 시작 하기</div>
<div class="close"><a href="#" class="simplemodal-close">x</a></div>
<div id="osx-modal-data">
Click button for connecting controllers.
<p><button id="listener" class="simplemodal-close">Connect</button></p>
컨트롤러와 연결이 끊어졌습니다. 연결을 하시기 바랍니다.
<p><button id="listener" class="simplemodal-close">연결하기</button></p>
</div>
</div>
</div>
Expand Down
5 changes: 4 additions & 1 deletion static/backbone.tv.keyevent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@
// the events can handle that occurred at body element only.
if (!(keyevent.srcElement instanceof HTMLBodyElement)) return this;


console.log(keyevent);

var r = KeyEventListener.responder()
, events = KeyEventListener._hotkeys[keyevent.which];

Expand All @@ -125,7 +128,7 @@
on: function(events, callback, context) {
var keyEvents = this.keyEvents || (this.keyEvents = {})
, hotKeyEvents = KeyEventListener._hotkeys || (KeyEventListener._hotkeys = {})
, event;
, event;

events = events.split(/\s+/);
while (event = events.shift()) {
Expand Down
2 changes: 1 addition & 1 deletion static/cbox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ body {
#osx-overlay {background-color:#000; cursor:wait;}

/* Container */
#osx-container {background-color:#eee; color:#000; font: 16px/24px "Lucida Grande",Arial,sans-serif; padding-bottom:4px; width:600px; -moz-border-radius-bottomleft:6px; -webkit-border-bottom-left-radius:6px; -moz-border-radius-bottomright:6px; -webkit-border-bottom-right-radius:6px; border-radius:0 0 6px 6px; -moz-box-shadow:0 0 64px #000; -webkit-box-shadow:0 0 64px #000; box-shadow:0 0 64px #000;}
#osx-container {background-color:#eee; color:#000; margin: 0 auto; font: 16px/24px "Lucida Grande",Arial,sans-serif; padding-bottom:4px; width:600px; -moz-border-radius-bottomleft:6px; -webkit-border-bottom-left-radius:6px; -moz-border-radius-bottomright:6px; -webkit-border-bottom-right-radius:6px; border-radius:0 0 6px 6px; -moz-box-shadow:0 0 64px #000; -webkit-box-shadow:0 0 64px #000; box-shadow:0 0 64px #000;}
#osx-container a {color:#ddd;}
#osx-container #osx-modal-title {color:#000; background-color:#ddd; border-bottom:1px solid #ccc; font-weight:bold; padding:6px 8px; text-shadow:0 1px 0 #f4f4f4;}
#osx-container .close {display:none; position:absolute; right:0; top:0;}
Expand Down
23 changes: 11 additions & 12 deletions static/cbox.sdk.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
/**
* Created with PyCharm.
* User: songhun
* Date: 10/27/12
* Time: 3:12 PM
* To change this template use File | Settings | File Templates.
*/

// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
Expand Down Expand Up @@ -57,7 +49,6 @@ var common = (function () {
// to ensure that the listeners are active before the NaCl module 'load'
// event fires.
var listenerDiv = document.getElementById('listener');
console.log(listenerDiv, moduleEl);
listenerDiv.appendChild(moduleEl);
}

Expand Down Expand Up @@ -237,7 +228,7 @@ document.addEventListener('DOMContentLoaded', function() {

if (loadFunction) {
loadFunction("cbox_sdk", "static", "cbox_sdk",
120, 30);
70, 25);

}
});
Expand All @@ -248,20 +239,23 @@ jQuery(function ($) {

var CBOX_SDK_focusIn = function(){
//TODO : Hide Layer
$("#osx-container").css("visibility","hidden");
};
var CBOX_SDK_focusOut = function(){
//TODO : Show Connect Layer
$("#osx-container").css("visibility","visible");
};

var CBOX_SDK_keyboard = function(){
//TODO : Connect Here for Keyboard Events
console.log(arguments);

};
var CBOX_SDK_gamepad : function(){
var CBOX_SDK_gamepad = function(){
//TODO : Connect Here for Gamepad Events
console.log(arguments);
};
var CBOX_SDK_nunchuk : function(){
var CBOX_SDK_nunchuk = function(){
//TODO : Connect Here for Nunchuk Events
console.log(arguments);
};
Expand Down Expand Up @@ -292,7 +286,12 @@ jQuery(function ($) {
}
}


$("#osx-modal-content").fadeIn('slow');
setTimeout(function(){
$("#nacl_module").css("position","absolute");
$("#nacl_module").css("margin","-5px 0 0 -60px");
},100);


});