Merge branch 'master' of https://github.com/vthibault/roBrowser

api.html

@@ -21,6 +21,7 @@
 					ROConfig.API              = event.data.api              || false;
 					ROConfig.socketProxy      = event.data.socketProxy      || null;
 					ROConfig.packetKeys       = event.data.packetKeys       || false;
+					ROConfig.saveFiles        = event.data.saveFiles        || false;
 					ROConfig.skipServerList   = event.data.skipServerList   || false;
 					ROConfig.skipIntro        = event.data.skipIntro        || false;
 					ROConfig.autoLogin        = event.data.autoLogin        || [];
@@ -32,7 +33,7 @@
 						var script  = document.createElement('script');
 						script.src  = 'src/Vendors/require.js?' + ROConfig.version;
 						script.type = 'text/javascript';
-						script.setAttribute('data-main', 'src/App/' + event.data.application + '?' + ROConfig.version);
+						script.setAttribute('data-main', 'src/App/' + event.data.application + '.js?' + ROConfig.version);
 
 						document.getElementsByTagName('head')[0].appendChild(script);
 						event.source.postMessage('ready', '*' );

api.js

@@ -182,6 +182,17 @@
 	ROBrowser.prototype.packetKeys = false;
 
 
+	/**
+	 * @var {boolean} should we save files in chrome filesystem ?
+	 * 
+	 * If set to true, then we try to save the files loaded from server/grfs on a filesystem to load
+	 * them faster the next time.
+	 * 
+	 * Only working on Chrome, status: deprecated.
+	 */
+	ROBrowser.prototype.saveFiles = false;
+
+
 	/**
 	 * @var {boolean} skip server list if only one server define ?
 	 *
@@ -287,9 +298,9 @@
 				frame.height       = this.height;
 				frame.style.border = 'none';
 
-				frame.setAttribute('allowfullscreen', true);
-				frame.setAttribute('webkitallowfullscreen', true);
-				frame.setAttribute('mozallowfullscreen', true);
+				frame.setAttribute('allowfullscreen', 'true');
+				frame.setAttribute('webkitallowfullscreen', 'true');
+				frame.setAttribute('mozallowfullscreen', 'true');
 
 				if (this.target) {
 					while (this.target.firstChild) {
@@ -362,6 +373,7 @@
 			api:              this.api,
 			socketProxy:      this.socketProxy,
 			packetKeys:       this.packetKeys,
+			saveFiles:        this.saveFiles,
 			skipServerList:   this.skipServerList,
 			skipIntro:        this.skipIntro,
 			autoLogin:        this.autoLogin,

src/Controls/EntityControl.js

@@ -224,7 +224,6 @@ define(function( require )
 
 			case Entity.TYPE_PC:
 				/// TODO: complete it : 
-				/// - check for guild leader action (invite, ally, ...)
 				/// - check for admin action (kick, mute, ...)
 
 				ContextMenu.remove();
@@ -236,6 +235,31 @@ define(function( require )
 					Trade.reqExchange(entity.GID, entity.display.name);
 				});
 
+
+				// Guild features
+				if (Session.hasGuild) {
+					if (Session.guildRight & 0x01 && !this.GUID) {
+						// Send (%s) a Guild invitation
+						ContextMenu.addElement( DB.getMessage(382).replace('%s', this.display.name), function(){
+							getModule('Engine/MapEngine/Guild').requestPlayerInvitation(entity.GID);
+						});
+					}
+
+					if (Session.isGuildMaster && this.GUID && Session.Entity.GUID !== this.GUID) {
+						ContextMenu.nextGroup();
+
+						// Set this guild as an Alliance
+						ContextMenu.addElement( DB.getMessage(399).replace('%s', this.display.name), function(){
+							getModule('Engine/MapEngine/Guild').requestAlliance(entity.GID);
+						});
+
+						// Set this guild as an Antagonist
+						ContextMenu.addElement( DB.getMessage(403).replace('%s', this.display.name), function(){
+							getModule('Engine/MapEngine/Guild').requestHostility(entity.GID);
+						});
+					}
+				}
+
 				//ContextMenu.addElement( DB.getMessage(360), openPrivateMessageWindow);
 
 				if (!Friends.isFriend(this.display.name)) {

src/Controls/MapControl.js

@@ -77,7 +77,6 @@ define(function( require )
 			.on('drop',                      onDrop.bind(this));
 
 		jQuery(window)
-			.on('contextmenu',     function(){ return false; })
 			.on('mousedown.map',   onMouseDown.bind(this))
 			.on('mouseup.map',     onMouseUp.bind(this));
 	};
@@ -234,7 +233,6 @@ define(function( require )
 	function onDrop( event )
 	{
 		var item, data;
-		var MapEngine = this;
 
 		try {
 			data = JSON.parse(

src/Controls/ProcessCommand.js

@@ -194,12 +194,28 @@ define(function( require )
 			case 'hi':
 				getModule('Engine/MapEngine/Friends').sayHi();
 				return;
+
+			case 'guild':
+				matches = text.match(/^guild\s+(")?([^"]+)(")?/);
+				if (matches && matches[2]) {
+					getModule('Engine/MapEngine/Guild').createGuild(matches[2]);
+					return;
+				}
+				break;
+
+			case 'breakguild':
+				matches = text.match(/^breakguild\s+(")?([^"]+)(")?/);
+				if (matches && matches[2]) {
+					getModule('Engine/MapEngine/Guild').breakGuild(matches[2]);
+					return;
+				}
+				break;
 		}
 
 
 		// /str+
 		// TODO: do we have to spam the server with "1" unit or do we have to fix the servers code ?
-		var matches = text.match(/^(\w{3})\+ (\d+)$/);
+		matches = text.match(/^(\w{3})\+ (\d+)$/);
 		if (matches) {
 			var pos = ['str', 'agi', 'vit', 'int', 'dex', 'luk'].indexOf(matches[1]);
 			if (pos > -1 && matches[2] !== 0) {

src/Core/Context.js

@@ -32,7 +32,7 @@ define(function()
 	 */
 	Context.isFullScreen = function IsFullScreen()
 	{
-		return (
+		return !!(
 			document.fullscreenElement ||
 			document.mozFullScreenElement ||
 			document.webkitFullscreenElement ||

src/Core/FileSystem.js

@@ -71,7 +71,7 @@ define(function()
 	 */
 	function init( files, save, quota )
 	{
-		var requestFileSystemSync, requestFileSystem, temporaryStorage;
+		var requestFileSystemSync, requestFileSystem;
 		_files = normalizeFilesPath(files);
 
 		if (!_available) {

src/Core/MemoryManager.js

@@ -26,7 +26,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 	 * Remove files from memory if not used until a period of time
 	 * @var {number}
 	 */
-	var _remember_time = 2 * 60 * 1000; // 2 min
+	var _rememberTime = 2 * 60 * 1000; // 2 min
 
 
 	/**
@@ -54,7 +54,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 		var item;
 
 		// Not in memory yet, create slot
-		if (!exist(filename)) {
+		if (!_memory[filename]) {
 			_memory[filename] = new MemoryItem();
 		}
 
@@ -80,7 +80,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 	 */
 	function exist( filename )
 	{
-		return filename in _memory;
+		return !!_memory[filename];
 	}
 
 
@@ -94,7 +94,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 	function set( filename, data, error )
 	{
 		// Not in memory yet, create slot
-		if (!exist(filename)) {
+		if (!_memory[filename]) {
 			_memory[filename] = new MemoryItem();
 		}
 
@@ -125,7 +125,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 
 		keys  = Object.keys(_memory);
 		count = keys.length;
-		tick  = now - _remember_time;
+		tick  = now - _rememberTime;
 
 		for (i = 0; i < count; ++i) {
 			item = _memory[ keys[i] ];
@@ -152,7 +152,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 	function remove( gl, filename )
 	{
 		// Not found ?
-		if (!exist(filename)) {
+		if (!_memory[filename]) {
 			return;
 		}
 

src/Core/Mobile.js

@@ -58,6 +58,26 @@ define(function( require )
 	};
 
 
+	/**
+	 * Remove autofocus on mobile.
+	 * Let the user decide to focus an input/textarea by himself
+	 */
+	var remoteAutoFocus = (function removeAutoFocusClosure()
+	{
+		var _done = false;
+
+		return function removeAutoFocus() {
+			if (_done) {
+				return;
+			}
+
+			jQuery.fn.focus  = function() {};
+			jQuery.fn.select = function() {};
+			_done            = true;
+		};
+	})();
+
+
 	/**
 	 * Return distance between touches
 	 *
@@ -138,8 +158,6 @@ define(function( require )
 	 */
 	var onTouchStart = function onTouchStartClosure()
 	{
-		var _disabled = false;
-
 		function delayedClick() {
 			// Only process mousedown if not doing a gesture
 			if (!_processGesture) {
@@ -161,6 +179,7 @@ define(function( require )
 
 		return function onTouchStart(event)
 		{
+			remoteAutoFocus();
 			_touches = event.originalEvent.touches;
 			event.stopImmediatePropagation();
 
@@ -175,7 +194,7 @@ define(function( require )
 				_scale          = touchDistance(_touches);
 				_angle          = touchAngle(_touches);
 				_processGesture = true;
-				return;
+				return false;
 			}
 
 			Mouse.screen.x  = _touches[0].pageX;
@@ -184,6 +203,7 @@ define(function( require )
 			_intersect      = true;
 
 			_timer = Events.setTimeout( delayedClick, 200);
+			return false;
 		};
 	}();
 
@@ -233,7 +253,7 @@ define(function( require )
 		}
 
 		var scale = touchDistance(touches) - _scale;
-		var angle = touchAngle(touches) / _angle;
+		//var angle = touchAngle(touches) / _angle;
 		var x     = Math.abs(touchTranslationX(_touches, touches));
 		var y     = Math.abs(touchTranslationY(_touches, touches));
 
@@ -244,9 +264,11 @@ define(function( require )
 		}
 
 		// Process zoom
-		Camera.zoomFinal += scale * 0.1;
-		Camera.zoomFinal = Math.min( Camera.zoomFinal, Math.abs(Camera.altitudeTo-Camera.altitudeFrom) * Camera.MAX_ZOOM );
-		Camera.zoomFinal = Math.max( Camera.zoomFinal,  2.0 );
+		if (Math.abs(scale) > 10) {
+			Camera.zoomFinal += scale * 0.1;
+			Camera.zoomFinal = Math.min( Camera.zoomFinal, Math.abs(Camera.altitudeTo-Camera.altitudeFrom) * Camera.MAX_ZOOM );
+			Camera.zoomFinal = Math.max( Camera.zoomFinal,  2.0 );
+		}
 	}
 
 

src/DB/DBManager.js

@@ -313,8 +313,18 @@ define(function(require)
 			return null;
 		}
 
+		// Dual weapon (based on range id)
+		if (id > 500 && (id < 2100 || id > 2200)) {
+			return DB.getWeaponPath(id, job, sex);
+		}
+
 		var baseClass = WeaponJobTable[job] || WeaponJobTable[0];
 
+		// ItemID to View Id
+		if ((id in ItemTable) && ('ClassNum' in ItemTable[id])) {
+			id = ItemTable[id].ClassNum;
+		}
+
 		return 'data/sprite/\xb9\xe6\xc6\xd0/' + baseClass + '/' + baseClass + '_' + SexTable[sex] + '_' + ( ShieldTable[id] || ShieldTable[1] );
 	};
 
@@ -333,6 +343,11 @@ define(function(require)
 
 		var baseClass = WeaponJobTable[job] || WeaponJobTable[0];
 
+		// ItemID to View Id
+		if ((id in ItemTable) && ('ClassNum' in ItemTable[id])) {
+			id = ItemTable[id].ClassNum;
+		}
+
 		return 'data/sprite/\xc0\xce\xb0\xa3\xc1\xb7/' + baseClass + '/' + baseClass + '_' + SexTable[sex] + ( WeaponTable[id] || ('_' + id) ) ;
 	};