Implement mobile-friendly version of docs output. (4aa9b9ee) · Commits · extjs / jsduck

lib/jsduck/categories.rb

+5 −5

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ module JsDuck
		end

		# Returns HTML listing of classes divided into categories
		def to_html
		def to_html(style="")
		html = @categories.map do \|category\|
		[
		"<div class='section'>",
		@@ -34,7 +34,7 @@ module JsDuck
		end.flatten.join("\n")

		return <<-EOHTML
		<div id='categories-content' style='display:none'>
		<div id='categories-content' style='#{style}'>
		#{html}
		</div>
		EOHTML
		@@ -57,9 +57,9 @@ module JsDuck
		return groups.map do \|g\|
		[
		"<h3>#{g['name']}</h3>",
		"<div class='links'>",
		g["classes"].map {\|cls\| @relations[cls] ? @doc_formatter.link(cls, nil, cls) : cls },
		"</div>",
		"<ul class='links'>",
		g["classes"].map {\|cls\| "<li>" + (@relations[cls] ? @doc_formatter.link(cls, nil, cls) : cls) + "</li>" },
		"</ul>",
		]
		end
		end

lib/jsduck/guides.rb

+2 −2

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ module JsDuck
		end

		# Returns HTML listing of guides
		def to_html
		def to_html(style="")
		html = @groups.map do \|group\|
		[
		"<h3>#{group['title']}</h3>",
		@@ -141,7 +141,7 @@ module JsDuck
		end.flatten.join("\n")

		return <<-EOHTML
		<div id='guides-content' style='display:none'>
		<div id='guides-content' style='#{style}'>
		#{html}
		</div>
		EOHTML

lib/jsduck/index_html.rb

+17 −3

Original line number	Diff line number	Diff line
		@@ -17,8 +17,10 @@ module JsDuck
		def write
		if @opts.seo
		FileUtils.cp(@opts.template_dir+"/index.php", @opts.output_dir+"/index.php")
		FileUtils.cp(@opts.template_dir+"/Mobile_Detect.php", @opts.output_dir+"/Mobile_Detect.php")
		create_template_html(@opts.template_dir+"/template.html", @opts.output_dir+"/template.html")
		create_print_template_html(@opts.template_dir+"/print-template.html", @opts.output_dir+"/print-template.html")
		create_index_template_html(@opts.template_dir+"/index-template.html", @opts.output_dir+"/index-template.html")
		else
		create_template_html(@opts.template_dir+"/template.html", @opts.output_dir+"/index.html")
		end
		@@ -32,9 +34,9 @@ module JsDuck
		"{header}" => @opts.header,
		"{footer}" => "<div id='footer-content' style='display: none'>#{@opts.footer}</div>",
		"{extjs_path}" => @opts.extjs_path,
		"{welcome}" => @assets.welcome.to_html,
		"{categories}" => @assets.categories.to_html,
		"{guides}" => @assets.guides.to_html,
		"{welcome}" => @assets.welcome.to_html("display:none"),
		"{categories}" => @assets.categories.to_html("display:none"),
		"{guides}" => @assets.guides.to_html("display:none"),
		"{head_html}" => @opts.head_html,
		"{body_html}" => @opts.body_html,
		})
		@@ -47,6 +49,18 @@ module JsDuck
		})
		end

		def create_index_template_html(in_file, out_file)
		categories = @assets.categories.to_html
		guides = @assets.guides.to_html

		write_template(in_file, out_file, {
		"{title}" => @opts.title,
		"{header}" => @opts.header,
		"{categories}" => categories ? "<h1>API Documentation</h1> #{categories}" : "",
		"{guides}" => guides ? "<h1>Guides</h1> #{guides}" : "",
		})
		end

		# Opens in_file, replaces {keys} inside it, writes to out_file
		def write_template(in_file, out_file, replacements)
		Logger.log("Writing", out_file)

lib/jsduck/welcome.rb

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@ module JsDuck
		end

		# Returns the HTML
		def to_html
		"<div id='welcome-content' style='display:none'>#{@html}</div>"
		def to_html(style="")
		"<div id='welcome-content' style='#{style}'>#{@html}</div>"
		end

		end

template/Mobile_Detect.php

0 → 100644

+316 −0

Original line number	Diff line number	Diff line
		<?php
		/**
		* Mobile Detect
		* $Id: Mobile_Detect.php 51 2012-08-03 02:16:06Z serbanghita@gmail.com $
		*
		* @author Mobile_Detect v.1.0 Victor Stanciu <vic.stanciu@gmail.com>
		* Mobile_Detect v.2.x Serban Ghita <serban.ghita@gmail.com>
		*
		* @usage require_once 'Mobile_Detect.php';
		* $detect = new Mobile_Detect();
		* $detect->isMobile() or $detect->isTablet()
		*
		* For more specific usage see the documentation navigate to:
		* http://code.google.com/p/php-mobile-detect/wiki/Mobile_Detect
		*
		* @license http://www.opensource.org/licenses/mit-license.php The MIT License
		*/

		class Mobile_Detect {

		// External info.
		protected $userAgent = null;
		protected $httpHeaders;

		// Array holding all detection rules.
		protected $mobileDetectionRules;

		// List of mobile devices (phones)
		protected $phoneDevices = array(
		'iPhone' => '(iPhone.*Mobile\|iPod\|iTunes)',
		'BlackBerry' => 'BlackBerry\|rim[0-9]+',
		'HTC' => 'HTC\|HTC.*(6800\|8100\|8900\|A7272\|S510e\|C110e\|Legend\|Desire\|T8282)\|APX515CKT\|Qtek9090\|APA9292KT',
		'Nexus' => 'Nexus One\|Nexus S\|Galaxy.Nexus\|Android.Nexus',
		'Dell' => 'Dell.Streak\|Dell.Aero\|Dell.Venue\|DELL.Venue Pro\|Dell Flash\|Dell Smoke\|Dell Mini 3iX\|XCD28\|XCD35',
		'Motorola' => '\bDroid\b.Build\|DROIDX\|HRI39\|MOT\-\|A1260\|A1680\|A555\|A853\|A855\|A953\|A955\|A956\|Motorola.ELECTRIFY\|Motorola.i1\|i867\|i940\|MB200\|MB300\|MB501\|MB502\|MB508\|MB511\|MB520\|MB525\|MB526\|MB611\|MB612\|MB632\|MB810\|MB855\|MB860\|MB861\|MB865\|MB870\|ME501\|ME502\|ME511\|ME525\|ME600\|ME632\|ME722\|ME811\|ME860\|ME863\|ME865\|MT620\|MT710\|MT716\|MT720\|MT810\|MT870\|MT917\|Motorola.TITANIUM\|WX435\|WX445\|XT300\|XT301\|XT311\|XT316\|XT317\|XT319\|XT320\|XT390\|XT502\|XT530\|XT531\|XT532\|XT535\|XT603\|XT610\|XT611\|XT615\|XT681\|XT701\|XT702\|XT711\|XT720\|XT800\|XT806\|XT860\|XT862\|XT875\|XT882\|XT883\|XT894\|XT909\|XT910\|XT912\|XT928',
		'Samsung' => 'Samsung\|BGT-S5230\|GT-B2100\|GT-B2700\|GT-B2710\|GT-B3210\|GT-B3310\|GT-B3410\|GT-B3730\|GT-B3740\|GT-B5510\|GT-B5512\|GT-B5722\|GT-B6520\|GT-B7300\|GT-B7320\|GT-B7330\|GT-B7350\|GT-B7510\|GT-B7722\|GT-B7800\|GT-C3010\|GT-C3011\|GT-C3060\|GT-C3200\|GT-C3212\|GT-C3212I\|GT-C3222\|GT-C3300\|GT-C3300K\|GT-C3303\|GT-C3303K\|GT-C3310\|GT-C3322\|GT-C3330\|GT-C3350\|GT-C3500\|GT-C3510\|GT-C3530\|GT-C3630\|GT-C3780\|GT-C5010\|GT-C5212\|GT-C6620\|GT-C6625\|GT-C6712\|GT-E1050\|GT-E1070\|GT-E1075\|GT-E1080\|GT-E1081\|GT-E1085\|GT-E1087\|GT-E1100\|GT-E1107\|GT-E1110\|GT-E1120\|GT-E1125\|GT-E1130\|GT-E1160\|GT-E1170\|GT-E1175\|GT-E1180\|GT-E1182\|GT-E1200\|GT-E1210\|GT-E1225\|GT-E1230\|GT-E1390\|GT-E2100\|GT-E2120\|GT-E2121\|GT-E2152\|GT-E2220\|GT-E2222\|GT-E2230\|GT-E2232\|GT-E2250\|GT-E2370\|GT-E2550\|GT-E2652\|GT-E3210\|GT-E3213\|GT-I5500\|GT-I5503\|GT-I5700\|GT-I5800\|GT-I5801\|GT-I6410\|GT-I6420\|GT-I7110\|GT-I7410\|GT-I7500\|GT-I8000\|GT-I8150\|GT-I8160\|GT-I8320\|GT-I8330\|GT-I8350\|GT-I8530\|GT-I8700\|GT-I8703\|GT-I8910\|GT-I9000\|GT-I9001\|GT-I9003\|GT-I9010\|GT-I9020\|GT-I9023\|GT-I9070\|GT-I9100\|GT-I9103\|GT-I9220\|GT-I9250\|GT-I9300\|GT-I9300 \|GT-M3510\|GT-M5650\|GT-M7500\|GT-M7600\|GT-M7603\|GT-M8800\|GT-M8910\|GT-N7000\|GT-P6810\|GT-P7100\|GT-S3110\|GT-S3310\|GT-S3350\|GT-S3353\|GT-S3370\|GT-S3650\|GT-S3653\|GT-S3770\|GT-S3850\|GT-S5210\|GT-S5220\|GT-S5229\|GT-S5230\|GT-S5233\|GT-S5250\|GT-S5253\|GT-S5260\|GT-S5263\|GT-S5270\|GT-S5300\|GT-S5330\|GT-S5350\|GT-S5360\|GT-S5363\|GT-S5369\|GT-S5380\|GT-S5380D\|GT-S5560\|GT-S5570\|GT-S5600\|GT-S5603\|GT-S5610\|GT-S5620\|GT-S5660\|GT-S5670\|GT-S5690\|GT-S5750\|GT-S5780\|GT-S5830\|GT-S5839\|GT-S6102\|GT-S6500\|GT-S7070\|GT-S7200\|GT-S7220\|GT-S7230\|GT-S7233\|GT-S7250\|GT-S7500\|GT-S7530\|GT-S7550\|GT-S8000\|GT-S8003\|GT-S8500\|GT-S8530\|GT-S8600\|SCH-A310\|SCH-A530\|SCH-A570\|SCH-A610\|SCH-A630\|SCH-A650\|SCH-A790\|SCH-A795\|SCH-A850\|SCH-A870\|SCH-A890\|SCH-A930\|SCH-A950\|SCH-A970\|SCH-A990\|SCH-I100\|SCH-I110\|SCH-I400\|SCH-I405\|SCH-I500\|SCH-I510\|SCH-I515\|SCH-I600\|SCH-I730\|SCH-I760\|SCH-I770\|SCH-I830\|SCH-I910\|SCH-I920\|SCH-LC11\|SCH-N150\|SCH-N300\|SCH-R100\|SCH-R300\|SCH-R351\|SCH-R400\|SCH-R410\|SCH-T300\|SCH-U310\|SCH-U320\|SCH-U350\|SCH-U360\|SCH-U365\|SCH-U370\|SCH-U380\|SCH-U410\|SCH-U430\|SCH-U450\|SCH-U460\|SCH-U470\|SCH-U490\|SCH-U540\|SCH-U550\|SCH-U620\|SCH-U640\|SCH-U650\|SCH-U660\|SCH-U700\|SCH-U740\|SCH-U750\|SCH-U810\|SCH-U820\|SCH-U900\|SCH-U940\|SCH-U960\|SCS-26UC\|SGH-A107\|SGH-A117\|SGH-A127\|SGH-A137\|SGH-A157\|SGH-A167\|SGH-A177\|SGH-A187\|SGH-A197\|SGH-A227\|SGH-A237\|SGH-A257\|SGH-A437\|SGH-A517\|SGH-A597\|SGH-A637\|SGH-A657\|SGH-A667\|SGH-A687\|SGH-A697\|SGH-A707\|SGH-A717\|SGH-A727\|SGH-A737\|SGH-A747\|SGH-A767\|SGH-A777\|SGH-A797\|SGH-A817\|SGH-A827\|SGH-A837\|SGH-A847\|SGH-A867\|SGH-A877\|SGH-A887\|SGH-A897\|SGH-A927\|SGH-B100\|SGH-B130\|SGH-B200\|SGH-B220\|SGH-C100\|SGH-C110\|SGH-C120\|SGH-C130\|SGH-C140\|SGH-C160\|SGH-C170\|SGH-C180\|SGH-C200\|SGH-C207\|SGH-C210\|SGH-C225\|SGH-C230\|SGH-C417\|SGH-C450\|SGH-D307\|SGH-D347\|SGH-D357\|SGH-D407\|SGH-D415\|SGH-D780\|SGH-D807\|SGH-D980\|SGH-E105\|SGH-E200\|SGH-E315\|SGH-E316\|SGH-E317\|SGH-E335\|SGH-E590\|SGH-E635\|SGH-E715\|SGH-E890\|SGH-F300\|SGH-F480\|SGH-I200\|SGH-I300\|SGH-I320\|SGH-I550\|SGH-I577\|SGH-I600\|SGH-I607\|SGH-I617\|SGH-I627\|SGH-I637\|SGH-I677\|SGH-I700\|SGH-I717\|SGH-I727\|SGH-I777\|SGH-I780\|SGH-I827\|SGH-I847\|SGH-I857\|SGH-I896\|SGH-I897\|SGH-I900\|SGH-I907\|SGH-I917\|SGH-I927\|SGH-I937\|SGH-I997\|SGH-J150\|SGH-J200\|SGH-L170\|SGH-L700\|SGH-M110\|SGH-M150\|SGH-M200\|SGH-N105\|SGH-N500\|SGH-N600\|SGH-N620\|SGH-N625\|SGH-N700\|SGH-N710\|SGH-P107\|SGH-P207\|SGH-P300\|SGH-P310\|SGH-P520\|SGH-P735\|SGH-P777\|SGH-Q105\|SGH-R210\|SGH-R220\|SGH-R225\|SGH-S105\|SGH-S307\|SGH-T109\|SGH-T119\|SGH-T139\|SGH-T209\|SGH-T219\|SGH-T229\|SGH-T239\|SGH-T249\|SGH-T259\|SGH-T309\|SGH-T319\|SGH-T329\|SGH-T339\|SGH-T349\|SGH-T359\|SGH-T369\|SGH-T379\|SGH-T409\|SGH-T429\|SGH-T439\|SGH-T459\|SGH-T469\|SGH-T479\|SGH-T499\|SGH-T509\|SGH-T519\|SGH-T539\|SGH-T559\|SGH-T589\|SGH-T609\|SGH-T619\|SGH-T629\|SGH-T639\|SGH-T659\|SGH-T669\|SGH-T679\|SGH-T709\|SGH-T719\|SGH-T729\|SGH-T739\|SGH-T746\|SGH-T749\|SGH-T759\|SGH-T769\|SGH-T809\|SGH-T819\|SGH-T839\|SGH-T919\|SGH-T929\|SGH-T939\|SGH-T959\|SGH-T989\|SGH-U100\|SGH-U200\|SGH-U800\|SGH-V205\|SGH-V206\|SGH-X100\|SGH-X105\|SGH-X120\|SGH-X140\|SGH-X426\|SGH-X427\|SGH-X475\|SGH-X495\|SGH-X497\|SGH-X507\|SGH-X600\|SGH-X610\|SGH-X620\|SGH-X630\|SGH-X700\|SGH-X820\|SGH-X890\|SGH-Z130\|SGH-Z150\|SGH-Z170\|SGH-ZX10\|SGH-ZX20\|SHW-M110\|SPH-A120\|SPH-A400\|SPH-A420\|SPH-A460\|SPH-A500\|SPH-A560\|SPH-A600\|SPH-A620\|SPH-A660\|SPH-A700\|SPH-A740\|SPH-A760\|SPH-A790\|SPH-A800\|SPH-A820\|SPH-A840\|SPH-A880\|SPH-A900\|SPH-A940\|SPH-A960\|SPH-D600\|SPH-D700\|SPH-D710\|SPH-D720\|SPH-I300\|SPH-I325\|SPH-I330\|SPH-I350\|SPH-I500\|SPH-I600\|SPH-I700\|SPH-L700\|SPH-M100\|SPH-M220\|SPH-M240\|SPH-M300\|SPH-M305\|SPH-M320\|SPH-M330\|SPH-M350\|SPH-M360\|SPH-M370\|SPH-M380\|SPH-M510\|SPH-M540\|SPH-M550\|SPH-M560\|SPH-M570\|SPH-M580\|SPH-M610\|SPH-M620\|SPH-M630\|SPH-M800\|SPH-M810\|SPH-M850\|SPH-M900\|SPH-M910\|SPH-M920\|SPH-M930\|SPH-N100\|SPH-N200\|SPH-N240\|SPH-N300\|SPH-N400\|SPH-Z400\|SWC-E100',
		'Sony' => 'E10i\|SonyEricsson\|SonyEricssonLT15iv',
		'Asus' => 'Asus.*Galaxy',
		'Palm' => 'PalmSource\|Palm', // avantgo\|blazer\|elaine\|hiptop\|plucker\|xiino ; @todo - complete the regex.
		'Vertu' => 'Vertu\|Vertu.Ltd\|Vertu.Ascent\|Vertu.Ayxta\|Vertu.Constellation(F\|Quest)?\|Vertu.Monika\|Vertu.Signature', // Just for fun ;)
		'GenericPhone' => '(mmp\|pocket\|psp\|symbian\|Smartphone\|smartfon\|treo\|up.browser\|up.link\|vodafone\|wap\|nokia\|Series40\|Series60\|S60\|SonyEricsson\|N900\|PPC;\|MAUI.WAP.Browser\|LG-P500)'
		);
		// List of tablet devices.
		protected $tabletDevices = array(
		'BlackBerryTablet' => 'PlayBook\|RIM Tablet',
		'iPad' => 'iPad\|iPad.*Mobile', // @todo: check for mobile friendly emails topic.
		'Kindle' => 'Kindle\|Silk.*Accelerated',
		'SamsungTablet' => 'SAMSUNG.Tablet\|Galaxy.Tab\|GT-P1000\|GT-P1010\|GT-P6210\|GT-P6800\|GT-P6810\|GT-P7100\|GT-P7300\|GT-P7310\|GT-P7500\|GT-P7510\|SCH-I800\|SCH-I815\|SCH-I905\|SGH-I957\|SGH-I987\|SGH-T849\|SGH-T859\|SGH-T869\|SPH-P100\|GT-P1000\|GT-P3100\|GT-P3110\|GT-P5100\|GT-P5110\|GT-P6200\|GT-P7300\|GT-P7320\|GT-P7500\|GT-P7510\|GT-P7511',
		'HTCtablet' => 'HTC Flyer\|HTC Jetstream\|HTC-P715a\|HTC EVO View 4G\|PG41200',
		'MotorolaTablet' => 'xoom\|sholest\|MZ615\|MZ605\|MZ505\|MZ601\|MZ602\|MZ603\|MZ604\|MZ606\|MZ607\|MZ608\|MZ609\|MZ615\|MZ616\|MZ617',
		'AsusTablet' => 'Transformer\|TF101',
		'NookTablet' => 'NookColor\|nook browser\|BNTV250A\|LogicPD Zoom2',
		'AcerTablet' => 'Android.*\b(A100\|A101\|A200\|A500\|A501\|A510\|W500\|W500P\|W501\|W501P)\b',
		'YarvikTablet' => 'Android.*(TAB210\|TAB211\|TAB224\|TAB250\|TAB260\|TAB264\|TAB310\|TAB360\|TAB364\|TAB410\|TAB411\|TAB420\|TAB424\|TAB450\|TAB460\|TAB461\|TAB464\|TAB465\|TAB467\|TAB468)',
		'MedionTablet' => 'Android.\bOYO\b\|LIFE.(P9212\|P9514\|P9516\|S9512)\|LIFETAB',
		'ArnovaTablet' => 'AN10G2\|AN7bG3\|AN7fG3\|AN8G3\|AN8cG3\|AN7G3\|AN9G3\|AN7dG3\|AN7dG3ST\|AN7dG3ChildPad\|AN10bG3\|AN10bG3DT',
		'GenericTablet' => 'Tablet(?!.*PC)\|ViewPad7\|LG-V909\|MID7015\|BNTV250A\|LogicPD Zoom2\|\bA7EB\b\|CatNova8\|A1_07\|CT704\|CT1002\|\bM721\b',
		);
		// List of mobile Operating Systems.
		protected $operatingSystems = array(
		'AndroidOS' => '(android.mobile\|android(?!.mobile))',
		'BlackBerryOS' => '(blackberry\|rim tablet os)',
		'PalmOS' => '(avantgo\|blazer\|elaine\|hiptop\|palm\|plucker\|xiino)',
		'SymbianOS' => 'Symbian\|SymbOS\|Series60\|Series40\|\bS60\b',
		'WindowsMobileOS' => 'IEMobile\|Windows Phone\|Windows CE.*(PPC\|Smartphone)\|MSIEMobile\|Window Mobile\|XBLWP7',
		'iOS' => '(iphone\|ipod\|ipad)',
		'FlashLiteOS' => '',
		'JavaOS' => '',
		'NokiaOS' => '',
		'webOS' => '',
		'badaOS' => '\bBada\b',
		'BREWOS' => '',
		);
		// List of mobile User Agents.
		protected $userAgents = array(
		'Chrome' => '\bCrMo\b\|Chrome\/[.0-9]* Mobile',
		'Dolfin' => '\bDolfin\b',
		'Opera' => 'Opera.Mini\|Opera.Mobi\|Android.*Opera',
		'Skyfire' => 'skyfire',
		'IE' => 'IEMobile\|MSIEMobile',
		'Firefox' => 'fennec\|firefox.maemo\|(Mobile\|Tablet).Firefox\|Firefox.*Mobile',
		'Bolt' => 'bolt',
		'TeaShark' => 'teashark',
		'Blazer' => 'Blazer',
		'Safari' => 'Mobile.Safari\|Safari.Mobile',
		'Midori' => 'midori',
		'GenericBrowser' => 'NokiaBrowser\|OviBrowser\|SEMC.*Browser'
		);
		// Utilities.
		protected $utilities = array(
		'WebKit' => '(webkit)[ \/]([\w.]+)',
		'Bot' => 'Googlebot\|YandexBot\|bingbot\|ia_archiver\|AhrefsBot\|Ezooms\|GSLFbot\|WBSearchBot\|Twitterbot\|TweetmemeBot\|Twikle\|PaperLiBot\|Wotbox\|UnwindFetchor\|facebookexternalhit',
		'MobileBot' => 'Googlebot-Mobile\|YahooSeeker\/M1A1-R2D2',
		);

		function __construct(){

		$this->setHttpHeaders();
		$this->setUserAgent();

		$this->setMobileDetectionRules();

		}

		public function setHttpHeaders($httpHeaders = null){

		if(!empty($httpHeaders)){
		$this->httpHeaders = $httpHeaders;
		} else {
		foreach($_SERVER as $key => $value){
		if(substr($key,0,5)=='HTTP_'){
		$this->httpHeaders[$key] = $value;
		}
		}
		}

		}

		public function setUserAgent($userAgent = null){

		if(!empty($userAgent)){
		$this->userAgent = $userAgent;
		} else {
		$this->userAgent = isset($this->httpHeaders['HTTP_USER_AGENT']) ? $this->httpHeaders['HTTP_USER_AGENT'] : null;

		if(empty($this->userAgent)){
		$this->userAgent = isset($this->httpHeaders['HTTP_X_DEVICE_USER_AGENT']) ? $this->httpHeaders['HTTP_X_DEVICE_USER_AGENT'] : null;
		}
		}

		}

		/**
		* Method sets the mobile detection rules.
		*
		* This method is used for the magic methods $detect->is*()
		*/
		public function setMobileDetectionRules(){
		// Merge all rules together.
		$this->mobileDetectionRules = array_merge(
		$this->phoneDevices,
		$this->tabletDevices,
		$this->operatingSystems,
		$this->userAgents
		);

		}

		/**
		* Method sets the mobile detection rules + utilities.
		* The reason this is separate is because utilities rules
		* don't necessary imply mobile.
		*
		* This method is used inside the new $detect->is('stuff') method.
		*
		* @return bool
		*/
		public function setMobileDetectionRulesExtended(){


		// Merge all rules together.
		$this->mobileDetectionRules = array_merge(
		$this->phoneDevices,
		$this->tabletDevices,
		$this->operatingSystems,
		$this->userAgents,
		$this->utilities
		);

		}

		public function checkHttpHeadersForMobile(){

		if(
		isset($this->httpHeaders['HTTP_X_WAP_PROFILE']) \|\|
		isset($this->httpHeaders['HTTP_X_WAP_CLIENTID']) \|\|
		isset($this->httpHeaders['HTTP_WAP_CONNECTION']) \|\|
		isset($this->httpHeaders['HTTP_PROFILE']) \|\|
		isset($this->httpHeaders['HTTP_X_OPERAMINI_PHONE_UA']) \|\| // Reported by Nokia devices (eg. C3)
		isset($this->httpHeaders['HTTP_X_NOKIA_IPADDRESS']) \|\|
		isset($this->httpHeaders['HTTP_X_NOKIA_GATEWAY_ID']) \|\|
		isset($this->httpHeaders['HTTP_X_ORANGE_ID']) \|\|
		isset($this->httpHeaders['HTTP_X_VODAFONE_3GPDPCONTEXT']) \|\|
		isset($this->httpHeaders['HTTP_X_HUAWEI_USERID']) \|\|
		isset($this->httpHeaders['HTTP_UA_OS']) \|\| // Reported by Windows Smartphones.
		isset($this->httpHeaders['HTTP_X_MOBILE_GATEWAY']) \|\| // Reported by Verizon, Vodafone proxy system.
		( isset($this->httpHeaders['HTTP_UA_CPU']) &&
		$this->httpHeaders['HTTP_UA_CPU'] == 'ARM'
		) \|\| // Seen this on a HTC.
		isset($this->httpHeaders['HTTP_ACCEPT']) &&
		(strpos($this->httpHeaders['HTTP_ACCEPT'], 'text/vnd.wap.wml') !== false \|\|
		strpos($this->httpHeaders['HTTP_ACCEPT'], 'application/vnd.wap.xhtml+xml') !== false)
		){

		return true;

		}

		return false;

		}

		/**
		* @return array
		*/
		public function getRules()
		{
		return $this->mobileDetectionRules;
		}

		/**
		* Magic overloading method.
		*
		* @method boolean is[...]()
		* @param string $name
		* @param array $arguments
		* @return mixed
		*/
		public function __call($name, $arguments)
		{

		$key = substr($name, 2);
		return $this->matchUAAgainstKey($key);

		}

		private function matchDetectionRulesAgainstUA($userAgent = null){

		// Begin general search.
		foreach($this->getRules() as $_regex){
		if(empty($_regex)){ continue; }
		if( preg_match('/'.$_regex.'/is', (!empty($userAgent) ? $userAgent : $this->userAgent)) ){
		return true;
		}
		}

		return false;

		}

		// Search for a certain key.
		private function matchUAAgainstKey($key, $userAgent = null){

		// Make the keys lowercase so we can match: isIphone(), isiPhone(), isiphone(), etc.
		$key = strtolower($key);
		$_rules = array_change_key_case($this->getRules());

		if(array_key_exists($key, $_rules)){
		if(empty($_rules[$key])){ return null; }
		return (bool)preg_match('/'.$_rules[$key].'/is', (!empty($userAgent) ? $userAgent : $this->userAgent));
		}

		return false;

		}

		/**
		* Check if the device is mobile.
		* Returns true if any type of mobile device detected, including special ones
		* @return bool
		*/
		public function isMobile($userAgent = null, $httpHeaders = null) {

		if($httpHeaders){ $this->setHttpHeaders($httpHeaders); }
		if($userAgent){ $this->setUserAgent($userAgent); }

		$this->setMobileDetectionRules();

		if ($this->checkHttpHeadersForMobile()) {
		return true;
		} else {
		return $this->matchDetectionRulesAgainstUA();
		}

		}

		/**
		* Check if the device is a tablet.
		* Return true if any type of tablet device is detected.
		* @return boolean
		*/
		public function isTablet($userAgent = null, $httpHeaders = null) {

		foreach($this->tabletDevices as $_regex){
		if(preg_match('/'.$_regex.'/is', (!empty($userAgent) ? $userAgent : $this->userAgent))){
		return true;
		}
		}

		return false;

		}

		/**
		* This method checks for a certain property in the
		* userAgent.
		* @todo: The httpHeaders part is not yet used.
		*
		* @param $key
		* @param string $userAgent
		* @param string $httpHeaders
		* @return bool\|int\|null
		*/
		public function is($key, $userAgent = null, $httpHeaders = null){

		$this->setHttpHeaders($httpHeaders);
		$this->setUserAgent($userAgent);

		$this->setMobileDetectionRulesExtended();

		return $this->matchUAAgainstKey($key);

		}


		}
		No newline at end of file