Commit: 75adbe88d590e326807ed7f3203d3e77f0a9c39d - main (git)

Commit MetaInfo

• Revision: 75adbe88d590e326807ed7f3203d3e77f0a9c39d (tree)
• Zeit: 2012-09-12 23:21:59
• Autor: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

Merge branch 'master' of git.sourceforge.jp:/gitroot/mmo/main

Ändern Zusammenfassung

• add: client/bin/cards/modellist/main.js
• modified: client/bin/cards/textchat/main.js

Diff

--- /dev/null
+++ b/client/bin/cards/modellist/main.js
@@ -0,0 +1,39 @@
+
+/***MetaData***
+
+{
+	"name": "モデルリスト",
+	"icon": "icon.png",
+	"api_version": 1
+}
+
+***MetaData***/
+
+var list;
+list = new UI.List({
+	docking: UI.DOCKING_TOP | UI.DOCKING_LEFT | UI.DOCKING_RIGHT | UI.DOCKING_BOTTOM
+});
+
+var even_line = false;
+var model_names = Model.all();
+for (var i = 0; i < model_names.length; i++) {
+	if ((/char:/).test(model_names[i])) {
+		(function(model_name){
+			list.addItem(
+				new UI.Label({
+					docking: UI.DOCKING_TOP | UI.DOCKING_LEFT | UI.DOCKING_RIGHT,
+					text: model_name,
+					bgcolor: ((even_line = !even_line) ? "#EEAFEECC" : "#FFFFFFCC"),
+					onclick: function() {
+						Account.updateModelName(model_name)
+					}
+				})
+			);
+		})(model_names[i])
+	}
+}
+
+Card.board.width = 240;
+Card.board.height = 120;
+Card.board.docking = UI.DOCKING_BOTTOM | UI.DOCKING_RIGHT
+Card.board.addChild(list);
\ No newline at end of file

--- a/client/bin/cards/textchat/main.js
+++ b/client/bin/cards/textchat/main.js
@@ -31,7 +31,7 @@ Network.onReceive = function (info, msg) {
             list.addItem(
 		new UI.Label({
 		    docking: UI.DOCKING_TOP | UI.DOCKING_LEFT | UI.DOCKING_RIGHT,
-		    text: "[ private:" + info.player.name() + "] " + msg.body,
+		    text: "[private:" + info.player.name() + "] " + msg.body,
 		    bgcolor: ((even_line = !even_line) ? "#add8e6CC" : "#87ceebCC")
 		})
 	    );
@@ -128,7 +128,7 @@ InputBox.onEnter = function (text) {
                 args.trim();
                 var tok = args.split(" ");
                 var msgObject = {
-                    prvate: token[0],
+                    prvate: tok[0],
                     body: tok[1]
                     };
                 Network.sendAll(msgObject);