Context Navigation

← Previous Changeset
Next Changeset →

Changeset 35680

Timestamp:

10/22/09 15:06:58 (4 years ago)

Author:

Seacolor

Message:

チャンネル発言へのレスがサポートされたので対応

Location:

platform/air/Whony

Files:

: 1 removed
: 5 modified

lib/as3httpclientlib-1_0.swc (deleted)
obj/WhonyConfig.xml (modified) (2 diffs)
src/WassrClientMain.as (modified) (6 diffs)
src/model/TimeLineUtil.as (modified) (2 diffs)
src/net/Wassr.as (modified) (2 diffs)
src/net/WassrAPI.as (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed

platform/air/Whony/obj/WhonyConfig.xml

r35391	r35680
1	1	<?xml version="1.0" encoding="utf-8"?>
2		<!--Flex compiler config for project Whony generated by FDBuild-->
3		<!--============-->
4		<!--This file was generated by a tool.-->
	2	<!--This file was generated by a FDBuild.-->
5	3	<!--Any modifications you make may be lost.-->
6	4	<flex-config>
…	…
8	6	<compiler>
9	7	<source-path append="true">
10		<path-element>E:\usr\Kazushi\src\ActionScript\Whony\src</path-element>
11		<path-element>D:\bin\Adobe\Flex SDK 3\default\frameworks\libs\player\10</path-element>
12		<path-element>D:\bin\Adobe\Flex SDK 3\default\frameworks\libs\air</path-element>
	8	<path-element>E:\usr\Kazushi\src\coderepos\platform\air\Whony\src</path-element>
13	9	<path-element>D:\bin\FlashDevelop\Library\AS3\classes</path-element>
14	10	</source-path>
15	11	<library-path append="true">
16	12	<path-element>D:\bin\Adobe\Flex SDK 3\default\frameworks\libs\air\</path-element>
17		<path-element>E:\usr\Kazushi\src\~~ActionScript~~\Whony\lib</path-element>
	13	<path-element>E:\usr\Kazushi\src\coderepos\platform\air\Whony\lib</path-element>
18	14	</library-path>
19	15	</compiler>
20	16	<file-specs>
21		<path-element>E:\usr\Kazushi\src\~~ActionScript~~\Whony\src\WassrClient.mxml</path-element>
	17	<path-element>E:\usr\Kazushi\src\coderepos\platform\air\Whony\src\WassrClient.mxml</path-element>
22	18	</file-specs>
23	19	<default-background-color>#FFFFFF</default-background-color>

platform/air/Whony/src/WassrClientMain.as

r35507	r35680
100	100	import mx.styles.CSSStyleDeclaration;
101	101	import mx.utils.ObjectProxy;
	102	import mx.utils.ObjectUtil;
102	103	import mx.validators.StringValidator;
103	104	import flash.events.TimerEvent;
…	…
902	903	switch(event.keyCode) {
903	904	case Keyboard.ENTER:
904		if (locator.selectedStatus.channel == undefined) {
905		setReplayModeOn();
906		}
	905	setReplayModeOn();
907	906	break;
908	907	case Keyboard.C:
…	…
1561	1560	protected function onDataGridItemDoubleClick(event:ListEvent):void {
1562	1561	logger.info("List中のヒトコトがダブルクリックされました");
1563		if (locator.selectedStatus.channel == undefined) {
1564		setReplayModeOn();
1565		}
	1562	setReplayModeOn();
1566	1563	}
1567	1564
…	…
1598	1595	var login_id:String;
1599	1596	var nick:String;
	1597	var reply_user_login_id:String;
	1598	var reply_message:String;
	1599	var reply_status_url:String;
	1600	var reply_user_nick:String;
1600	1601	if (!_selectedItem.channel) {
1601	1602	login_id = _selectedItem.user_login_id;
1602	1603	nick = _selectedItem.user.screen_name;
	1604	reply_user_login_id = _selectedItem.reply_user_login_id;
	1605	reply_message = _selectedItem.reply_message;
	1606	reply_status_url = _selectedItem.reply_status_url;
	1607	reply_user_nick = _selectedItem.reply_user_nick;
	1608	reply_user_login_id = _selectedItem.reply_user_login_id;
1603	1609	} else {
1604	1610	login_id = _selectedItem.user.login_id;
1605	1611	nick = _selectedItem.user.nick;
	1612	var reply:Object = _selectedItem.reply;
	1613	if (reply) {
	1614	reply_user_login_id = reply.user.login_id;
	1615	reply_message = reply.html;
	1616	reply_status_url = reply.url;
	1617	reply_user_nick = reply.user.nick;
	1618	}
1606	1619	}
1607	1620	locator.timeLineMC.read(model.entity.User, function(result:Array):void {
…	…
1626	1639	wn_reply_html.removeEventListener(Event.RESIZE, serializeHTMLSize);
1627	1640
1628		if (_selectedItem.channel == undefined) {
1629		if (_selectedItem.reply_user_login_id) {
1630		if (_selectedItem.reply_message) {
1631		wn_reply_html.htmlText = "<style>* {font-size: " + locator.settings.font_size_main + "px; font-family: \"" + locator.settings.font_main + "\"; }</style>"
1632		+ ModelLocator.REPLY_LINE_HEADER
1633		+ "<a href=\"" + _selectedItem.reply_status_url + "\" target=\"_blank\">"
1634		+ TimeLineUtil.escapeHTML(_selectedItem.reply_message)
1635		+ ModelLocator.REPLY_NICK_HEADER
1636		+ _selectedItem.reply_user_nick
1637		+ ModelLocator.REPLY_ID_HEADER
1638		+ _selectedItem.reply_user_login_id
1639		+ ModelLocator.REPLY_ID_FOOTER
1640		+ "</a>";
1641		} else {
1642		wn_reply_html.htmlText = "<style>* {font-size: " + locator.settings.font_size_main + "px; font-family: \"" + locator.settings.font_main + "\"; }</style>"
1643		+ ModelLocator.REPLY_LINE_HEADER
1644		+ "<a href=\""
1645		+ ModelLocator.URL_USER_WASSR
1646		+ _selectedItem.reply_user_login_id + "\" target=\"_blank\">"
1647		+ _selectedItem.reply_user_nick
1648		+ ModelLocator.REPLY_ID_HEADER
1649		+ _selectedItem.reply_user_login_id
1650		+ ModelLocator.REPLY_ID_FOOTER
1651		+ "</a>"
1652		+ ModelLocator.REPLY_MESSAGE_PROTECTED;
1653		}
1654
1655		wn_html.height = 1;
1656		if (locator.settings.height_reply_html) {
1657		wn_reply_html.height = locator.settings.height_reply_html;
1658		}
1659
1660		wn_reply_html.addEventListener(Event.RESIZE, serializeHTMLSize);
1661
1662		wn_reply_html.includeInLayout = true;
1663		wn_reply_html.visible = true;
	1641	if (reply_user_login_id) {
	1642	if (reply_message) {
	1643	wn_reply_html.htmlText = "<style>* {font-size: " + locator.settings.font_size_main + "px; font-family: \"" + locator.settings.font_main + "\"; }</style>"
	1644	+ ModelLocator.REPLY_LINE_HEADER
	1645	+ "<a href=\"" + reply_status_url + "\" target=\"_blank\">"
	1646	+ TimeLineUtil.escapeHTML(reply_message)
	1647	+ ModelLocator.REPLY_NICK_HEADER
	1648	+ reply_user_nick
	1649	+ ModelLocator.REPLY_ID_HEADER
	1650	+ reply_user_login_id
	1651	+ ModelLocator.REPLY_ID_FOOTER
	1652	+ "</a>";
1664	1653	} else {
1665		wn_reply_html.includeInLayout = false;
1666		wn_reply_html.visible = false;
	1654	wn_reply_html.htmlText = "<style>* {font-size: " + locator.settings.font_size_main + "px; font-family: \"" + locator.settings.font_main + "\"; }</style>"
	1655	+ ModelLocator.REPLY_LINE_HEADER
	1656	+ "<a href=\""
	1657	+ ModelLocator.URL_USER_WASSR
	1658	+ reply_user_login_id + "\" target=\"_blank\">"
	1659	+ reply_user_nick
	1660	+ ModelLocator.REPLY_ID_HEADER
	1661	+ reply_user_login_id
	1662	+ ModelLocator.REPLY_ID_FOOTER
	1663	+ "</a>"
	1664	+ ModelLocator.REPLY_MESSAGE_PROTECTED;
1667	1665	}
1668	1666
1669		createHTML(TimeLineUtil.markUpURL(_selectedItem.html));
	1667	wn_html.height = 1;
	1668	if (locator.settings.height_reply_html) {
	1669	wn_reply_html.height = locator.settings.height_reply_html;
	1670	}
	1671
	1672	wn_reply_html.addEventListener(Event.RESIZE, serializeHTMLSize);
	1673
	1674	wn_reply_html.includeInLayout = true;
	1675	wn_reply_html.visible = true;
1670	1676	} else {
1671	1677	wn_reply_html.includeInLayout = false;
1672	1678	wn_reply_html.visible = false;
1673
	1679	}
	1680
	1681	if (_selectedItem.channel == undefined) {
	1682	createHTML(TimeLineUtil.markUpURL(_selectedItem.html));
	1683	} else {
1674	1684	createHTML("<a href=\""
1675	1685	+ ModelLocator.URL_CHANNEL_WASSR
…	…
1784	1794
1785	1795	try {
1786		locator.wassr.channel_message_update(channel_name, reqBody, _updateImage, function():void {
	1796	locator.wassr.channel_message_update(channel_name, reqBody, _updateImage, _reply_status_rid, function():void {
1787	1797	if (locator.settings.is_outputz) {
1788	1798	locator.outputz.post(WassrAPI.PATH_PROTOCOL + WassrAPI.PATH_HOST + WassrAPI.METHOD_UPDATE, reqBody.length, function():void {

platform/air/Whony/src/model/TimeLineUtil.as

r35391	r35680
1		/*
	1	/*
2	2	* Whony - Wassr Client Software
3	3	*
…	…
114	114
115	115	public static function formatHTMLAndJoinReply(status:Object, tab:Object = null):String {
116		var ~~rtnHTML:String~~;
	116	var htmlStrings:Vector.<String> = new Vector.<String>();
117	117
118		if (tab && tab.category == ModelLocator.TAB_CHANNEL_MATERIAL.category) {
119		rtnHTML = imageToText(status.html);
	118	if (status.channel && (!tab \|\| tab.category != ModelLocator.TAB_CHANNEL_MATERIAL.category)) {
	119	htmlStrings.push(ModelLocator.CHANNEL_STATUS_HEADER + status.channel.name_en + " ");
	120	}
	121
	122	htmlStrings.push(imageToText(status.html));
	123
	124	var reply_user_login_id:String;
	125	var reply_message:String;
	126	var reply_status_url:String;
	127	var reply_user_nick:String;
	128	if (!status.channel) {
	129	reply_user_login_id = status.reply_user_login_id;
	130	reply_message = status.reply_message;
	131	reply_status_url = status.reply_status_url;
	132	reply_user_nick = status.reply_user_nick;
	133	reply_user_login_id = status.reply_user_login_id;
120	134	} else {
121		if (status.reply_message) {
122		rtnHTML = imageToText(status.html) + "<i>" + ModelLocator.REPLY_LINE_HEADER_TOOLTIP + status.reply_user_login_id + ModelLocator.SEPARATOR_ID_BODY + escapeHTML(status.reply_message) + "</i>";
123		} else if (status.reply_user_login_id) {
124		rtnHTML = imageToText(status.html) + "<i>" + ModelLocator.REPLY_LINE_HEADER_TOOLTIP + status.reply_user_nick + ModelLocator.REPLY_ID_HEADER + status.reply_user_login_id + ModelLocator.REPLY_ID_FOOTER + ModelLocator.REPLY_MESSAGE_PROTECTED + "</i>";
125		} else if (status.channel != undefined) {
126		rtnHTML = ModelLocator.CHANNEL_STATUS_HEADER
127		+ status.channel.name_en + " "
128		+ imageToText(status.html);
129		} else {
130		rtnHTML = imageToText(status.html);
	135	var reply:Object = status.reply;
	136	if (reply) {
	137	reply_user_login_id = reply.user.login_id;
	138	reply_message = reply.html;
	139	reply_status_url = reply.url;
	140	reply_user_nick = reply.user.nick;
131	141	}
132	142	}
	143
	144	if (reply_message) {
	145	htmlStrings.push("<i>" + ModelLocator.REPLY_LINE_HEADER_TOOLTIP + reply_user_login_id + ModelLocator.SEPARATOR_ID_BODY + escapeHTML(reply_message) + "</i>");
	146	} else if (reply_user_login_id) {
	147	htmlStrings.push("<i>" + ModelLocator.REPLY_LINE_HEADER_TOOLTIP + reply_user_nick + ModelLocator.REPLY_ID_HEADER + reply_user_login_id + ModelLocator.REPLY_ID_FOOTER + ModelLocator.REPLY_MESSAGE_PROTECTED + "</i>");
	148	}
133	149
134		return ~~rtnHTML~~;
	150	return htmlStrings.join();
135	151	}
136	152	/** @private */

platform/air/Whony/src/net/Wassr.as

r35391	r35680
1		/*
	1	/*
2	2	* Whony - Wassr Client Software
3	3	*
…	…
52	52	function channel_user_list(callback:Function, errorHandler:Function = null):void;
53	53	function channel_message_list(name_en:String, callback:Function, errorHandler:Function = null):void;
54		function channel_message_update(name_en:String, body:String, image:File = null, callback:Function = null, errorHandler:Function = null):void;
	54	function channel_message_update(name_en:String, body:String, image:File = null, reply_channel_message_rid:String = null, callback:Function = null, errorHandler:Function = null):void;
55	55	}
56	56

platform/air/Whony/src/net/WassrAPI.as

r35391	r35680
1		/*
	1	/*
2	2	* Whony - Wassr Client Software
3	3	*
…	…
146	146	}
147	147
148		public function channel_message_update(name_en:String, body:String, image:File = null, callback:Function = null, errorHandler:Function = null):void {
	148	public function channel_message_update(name_en:String, body:String, image:File = null, reply_channel_message_rid:String = null, callback:Function = null, errorHandler:Function = null):void {
149	149	logger.debug("method channel_message_update({0})", arguments);
150	150	checkAuthenticated();
…	…
152	152	if (image) {
153	153	param.image = image;
	154	}
	155	if (reply_channel_message_rid) {
	156	param.reply_channel_message_rid = reply_channel_message_rid;
154	157	}
155	158	new APIPostThread(api_data, METHOD_CHANNEL_MESSAGE_UPDATE, param, callback).start();

Download in other formats: