v.2.0.1 fix zoom issue

theamith · Nov 7, 2011 · 72bab87 · 72bab87
1 parent 824cead
commit 72bab87
Show file tree

Hide file tree

Showing 7 changed files with 193 additions and 119 deletions.
diff --git a/README b/README
@@ -1,5 +1,5 @@
 jquery.nicescroll
-v. 2.0.0 11-03-2011
+v. 2.0.1 11-07-2011
 copyright 2011 InuYaksa*2011
 licensed under the MIT
 http://areaaperta.com/nicescroll
@@ -11,7 +11,7 @@ It supports DIVs, IFrames and document page (body) scrollbars.
 Compatible with Firefox 4+, Chrome 5+, Safari 4+ (win/mac), Opera 10+, IE 6+. (all A-grade browsers)
 Compatible with iOS devices as iPad. So you have scrollable divs for iPad.
 
-Sexy zoom feature, you can "zoom-in" the content of any nicescroll'ed div. Nice to use and nice to see, all the content of the div in fullscreen mode. It works on desktop (double click on div) either in mobile/touch devices using pitch gesture.
+Sexy zoom feature, you can "zoom-in" the content of any nicescroll'ed div. Nice to use and nice to see, all the content of the div in fullscreen mode. It works on desktop (double click on div) either in mobile/touch devices using pinch gesture.
 
 On modern browsers hardware accelerated scrolling has implemented.
 
@@ -101,7 +101,7 @@ When you call "niceScroll" you can pass some parameters to custom visual aspects
 . hwacceleration - use hardware accelerated scroll when supported, default is true
 . boxzoom - enable zoom for box content, default is false
 . dblclickzoom - (only when boxzoom=true) zoom activated when double click on box, default is true
-. gesturezoom - (only when boxzoom=true and with touch devices) zoom activated when pitch out/in on box, default is true
+. gesturezoom - (only when boxzoom=true and with touch devices) zoom activated when pinch out/in on box, default is true
 
 
 * LICENSE

diff --git a/changelog_2.0.0.txt b/changelog_2.0.0.txt
diff --git a/changelog_2.0.1.txt b/changelog_2.0.1.txt
@@ -0,0 +1,20 @@
+Changelog nicescroll release 2.0.1
+http://areaaperta.com/nicescroll
+https://github.com/inuyaksa/jquery.nicescroll
+
+
+New features
+none
+
+
+Changed features
+- cursorborderradius default value to "5px"
+
+
+Fixes
+- zoom preserve styles issue (i.e. zoom out on ipad doesn't work)
+- zoom in feature, it resets margins to zero for fullscreen content now
+
+
+Known issues
+- zoom on ios 4.x is unreliable
diff --git a/demo/index.html b/demo/index.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>jQuery NiceScroll Test 2.0.0</title>
+<title>jQuery NiceScroll Test 2.0.1</title>
 <style type="text/css">
 #boxscroll {
 	padding: 40px;
@@ -18,7 +18,6 @@
 	width: 500px;
 	border: 2px solid #F00;
 	overflow: auto;
-  position: relative;
 }
 #boxscroll3 {
 	overflow: hidden;
@@ -32,6 +31,16 @@
   overflow:auto;
 	border: 2px solid #0F0;
 }
+#boxscroll4 {
+	height: 300px;
+	margin-top: 40px;
+	background-color: #00FF66;
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size: 18px;
+	padding: 20px;
+	color: #006633;
+	overflow: auto;
+}
 </style>
 
 <script src="js/jquery.min.js"></script>
@@ -50,6 +59,11 @@
 
     $("#boxscroll2").niceScroll("#contentscroll2",{cursorcolor:"#F00",cursoropacitymax:0.7,boxzoom:true});  // Second scrollable DIV
     $("#boxframe").niceScroll("#boxscroll3",{cursorcolor:"#0F0",cursoropacitymax:0.7,boxzoom:true});  // This is an IFrame (iPad compatible)
+
+
+   $("#boxscroll4").niceScroll("#boxscroll4 .wrapper",{boxzoom:true});  // The document page (body)
+
+
   });
 </script>
 
@@ -59,6 +73,7 @@
 
 <body>
 <div id="boxscroll">
+THIS IS A SIMPLE SCROLLABLE DIV
   <h2> Package Description </h2>
   <p>Release Date: August 10, 2010</p>
   <p>The <a title="http://www.openprinting.org/show_driver.cgi?driver=hpijs" rel="nofollow" href="http://www.openprinting.org/show_driver.cgi?driver=hpijs">HPIJS</a> driver is the free, <a title="http://hplipopensource.com/hplip-web/index.html" rel="nofollow" href="http://hplipopensource.com/hplip-web/index.html">open-source driver</a> issued by HP for their DeskJet and LaserJet printers. For most <a title="" href="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/macosx/hpijs#Printers">supported printers</a>,   this driver produces output quality equivalent to the proprietary HP   drivers. In photo mode, with photo paper, the output quality is very   high, especially for the HP DeskJet 990C and later models, which   auto-detect the paper type in hardware. Photo printing is fully   supported in the newer 6- and 7-ink models.</p>
@@ -90,7 +105,8 @@ <h2> Printer Set Up Instructions </h2>
 
 <div id="boxscroll2">
   <div id="contentscroll2">
-    <h2> Package Description </h2>
+    THIS IS A DIV + WRAPPER
+    <h2>Package Description </h2>
     <p>Release Date: August 10, 2010</p>
     <p>The <a title="http://www.openprinting.org/show_driver.cgi?driver=hpijs" rel="nofollow" href="http://www.openprinting.org/show_driver.cgi?driver=hpijs">HPIJS</a> driver is the free, <a title="http://hplipopensource.com/hplip-web/index.html" rel="nofollow" href="http://hplipopensource.com/hplip-web/index.html">open-source driver</a> issued by HP for their DeskJet and LaserJet printers. For most <a title="" href="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/macosx/hpijs#Printers">supported printers</a>,   this driver produces output quality equivalent to the proprietary HP   drivers. In photo mode, with photo paper, the output quality is very   high, especially for the HP DeskJet 990C and later models, which   auto-detect the paper type in hardware. Photo printing is fully   supported in the newer 6- and 7-ink models.</p>
     <p>A major advantage of using this driver over those supplied by HP is   the direct interface between HPIJS and the native CUPS spooler, which   allows printing from any printer over any available connection such as   USB, AppleTalk, TCP/IP (via LPD and IPP), HP JetDirect, and shared   windows printers via SAMBA. Additionally, this driver utilizes the   existing Mac OS X USB &quot;backend&quot; and thus does not install any software   that might interfere with standard USB operation.</p>
@@ -125,5 +141,68 @@ <h2> Printer Set Up Instructions </h2>
 </div>
 
 
+<div id="boxscroll4">
+<div class="wrapper">
+  <p><strong>Goggles</strong><br />
+    From Wikipedia, the free encyclopedia<br />
+  http://en.wikipedia.org/wiki/Goggles</p>
+  <p><br />
+    Page semi-protected<br />
+    SealMask watersport goggles made by AquaSphere</p>
+  <p>Goggles or safety glasses are forms of protective eyewear that usually enclose or protect the area surrounding the eye in order to prevent particulates, water or chemicals from striking the eyes. They are used in chemistry laboratories and in woodworking. They are often used in snow sports as well, and in swimming. Goggles are often worn when using power tools such as drills or chainsaws to prevent flying particles from damaging the eyes. Many types of goggles are available as prescription goggles for those with vision problems.<br />
+    Contents<br />
+    [hide] </p>
+  <p> 1 History<br />
+    2 Types<br />
+    3 Fashion<br />
+    4 Non-human<br />
+    5 See also<br />
+    6 References</p>
+  <p>History</p>
+  <p>The Eskimos carved Inuit snow goggles from caribou antler, and wood and shell, to help prevent snow blindness. The goggles were curved to fit the user's face and had a large groove cut in the back to allow for the nose. A long thin slit was cut through the goggles to allow in a small amount of light, diminishing subsequent ultraviolet rays. The goggles were held to the head by a cord made of caribou sinew.</p>
+  <p>In the early 20th century, goggles were worn by drivers of uncovered cars to prevent irritation of the eyes by dust or wind. [1] Likewise in the first ten years after the invention of the airplane in 1903 goggles became a necessity as wind blow became more severe as aircraft speeds increased and as protection against bugstrikes at high altitudes. The first pilot to wear goggles was probably Charles Manly in his failed attempt to fly Samuel Langley's aerodrome in 1903.</p>
+  <p> Traditional Inuit goggles used to combat snow blindness</p>
+  <p> Metal nenets goggles</p>
+  <p> Blowtorching goggles and safety helmet</p>
+  <p> Swimming goggles</p>
+  <p>Types</p>
+  <p>The requirements for goggles varies depending on the use. Some examples:</p>
+  <p> Cold weather: Most modern cold-weather goggles have two layers of lens to prevent the interior from becoming &quot;foggy&quot;. With only a single lens, the interior water vapor condenses onto the lens because the lens is colder than the vapor, although anti-fog agents can be used. The reasoning behind dual layer lens is that the inner lens will be warm while the outer lens will be cold. As long as the temperature of the inner lens is close to that of the interior water vapor, the vapor should not condense. However, if water vapor gets between the layers of the lens, condensation can occur between the lenses and is almost impossible to get rid of; thus, properly constructed and maintained dual-layer lenses should be air-tight to prevent water vapor from getting in between the lenses.<br />
+    Swimming: Must be watertight to prevent water, such as salt water when swimming in the ocean, or chlorinated water when swimming in a pool, from irritating the eyes or blurring vision. Allows swimmers to see clearly underwater. They will not be usable more than a few feet underwater, because the water pressure will press them tightly against the face. Examples of these include the Swedish goggles.<br />
+    Power tools: Must be made of an unbreakable material that prevents chunks of metal, wood, plastic, concrete, and so on from hitting or piercing the eye. Usually has some sort of ventilation to prevent sweat from building up inside the goggles and fogging the surface.<br />
+    Blowtorch goggles: These protect the eyes from glare and flying sparks and hot metal splashes while using or near as blowtorch. They are not the correct filters for arc welding.<br />
+    Welding goggles: Includes all goggles for eye protection during welding or cutting. They provide protection against debris, the heat from welding, and, with the proper filters, the optical radiation resulting from the welding, which can otherwise cause arc eye.<br />
+    Motorcycle riding and other open-air activities: Prevents insects, dust, and so on from hitting the eyes.<br />
+    Laboratory and research: Combines impact resistance with side shields to prevent chemical splashes reaching the eyes. May also include laser protection which would be covered by EN 207 (Europe) and ANSI Z 136 (United States). Examples of these include red adaptation goggles.<br />
+    Racquetball: Protect the eyes from racquets swinging in an enclosed area and from impact from hard rubber ball.<br />
+    Winter sports: Protect the eyes from glare and from icy particles flying up from the ground.<br />
+    Astronomy and meteorology: dark adaptor goggles are used before going outside at night, in order to help the eyes adapt to the dark.<br />
+    Basketball: Several NBA players have worn goggles during play, including Kareem Abdul-Jabbar, James Worthy, Horace Grant, Kurt Rambis and Amar'e Stoudemire; they prevent a fellow player from scratching or hitting the eyes when trying to grab the basketball.<br />
+    Aviation: In open cockpit aircraft, such as old biplanes, aviators, such as Amelia Earhart and Charles Kingsford Smith, would wear goggles to help protect from the wind and are still in use today. Examples of these include the AN-6530 goggles.<br />
+    Virtual reality: A virtual reality headset, sometimes called &quot;goggles&quot;, is a wrap-around visual interface to display computer output. Commonly the computer display information is presented as a three-dimensional representation of real-world environments.</p>
+  <p>Fashion</p>
+  <p>Goggles are often worn as a fashion statement in certain subcultures, most often as part of the cybergoth subculture. They are usually worn over the eyes or up on the forehead to secure 'falls': a type of long, often brightly-coloured, synthetic hairpiece. Fans of the steampunk genre or subculture also frequently wear steampunk-styled goggles, particularly when performing in a live action role-playing game.</p>
+  <p>Goggles are also frequently used by anime and manga characters as a fashion statement. For example, it is an idiosyncrasy of team leader characters in the Digimon anime to wear goggles. Other notable characters who wear goggles are the young Naruto Uzumaki and Konohamaru from Naruto, Matt from Death Note and Usopp from One Piece.<br />
+    Non-human<br />
+    Bullfighting horse wearing eye protection<br />
+    A US Military working dog attached to a helicopter hoist in Afghanistan.</p>
+  <p>Goggles are available for horses used in speed sports such as horse racing.[2] In some traditions of horse mounted bullfighting, the horse may wear a protective cloth over its eyes.</p>
+  <p>Goggles have been used on military working dogs, for protection in harsh conditions, such as sandstorms and rotorwash from helicopters. One of the brands of these types of goggles are Doggles.<br />
+    See also<br />
+    Wikimedia Commons has media related to: Goggles</p>
+  <p> Ballistic Eye Wear<br />
+    Beer goggles<br />
+    Google Goggles<br />
+    Night vision device<br />
+    Personal protective equipment<br />
+    Safety engineering<br />
+    Visor</p>
+  <p>References</p>
+  <p> ^ Alfred C. Harmsworth (1904). Motors and Motor-driving.<br />
+    ^ Landers T. A. (2006) Professional Care of the Racehorse, Revised Edition: A Guide to Grooming, Feeding, and Handling the Equine Athlete. Blood Horse Publications. 308 pages. Page 138.</p>
+  <p></p>
+</div>
+</div>
+
 </body>
 </html>