<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>demos/basic.html</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -2,4 +2,5 @@
 pkg
 test/unit/tmp/*
 doc
-tmp
\ No newline at end of file
+tmp
+dist/*
\ No newline at end of file</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,5 @@
+*2.0.0 alpha 2* (September 28, 2009)
+
 * WebKit CSS transition support and support for cubic-bezier easing (JS implementation of transition-timing-function)
   WebKit support is transparent - if running on a supported browser, and the morph requested can be made
   with CSS-based animation, it will automatically use the -webkit-transition-* CSS properties instead of the </diff>
      <filename>CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -41,8 +41,9 @@ volume websites).
 
 = Usage
 
-scripty2 is dependent on the Prototype JavaScript framework. You'll need to grab
-the latest version from http://prototypejs.org/.
+scripty2 is dependent on the Prototype JavaScript framework. The download
+and source comes with a compatible version, or grab the latest version yourself
+from http://prototypejs.org/.
 
 Put prototype.js and s2.js in a folder of your website, and include them as follows:
 </diff>
      <filename>README.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -3,7 +3,11 @@ require 'rake/packagetask'
 
 SCRIPTY2_ROOT     = File.expand_path(File.dirname(__FILE__))
 SCRIPTY2_SRC_DIR  = File.join(SCRIPTY2_ROOT, 'src')
+
 SCRIPTY2_DIST_DIR = File.join(SCRIPTY2_ROOT, 'dist')
+SCRIPTY2_DEBUG_DIR = File.join(SCRIPTY2_DIST_DIR, 'debug')
+SCRIPTY2_RELEASE_DIR = File.join(SCRIPTY2_DIST_DIR, 'release')
+
 SCRIPTY2_DOC_DIR  = File.join(SCRIPTY2_ROOT, 'doc')
 SCRIPTY2_PKG_DIR  = File.join(SCRIPTY2_ROOT, 'pkg')
 SCRIPTY2_VERSION  = YAML.load(IO.read(File.join(SCRIPTY2_SRC_DIR, 'constants.yml')))['SCRIPTY2_VERSION']
@@ -31,27 +35,35 @@ def sprocketize(path, source, destination = source)
     :source_files =&gt; [source]
   )
   
-  secretary.concatenation.save_to(File.join(SCRIPTY2_DIST_DIR, destination))
+  secretary.concatenation.save_to(File.join(SCRIPTY2_DEBUG_DIR, destination))
 end
 
-task :default =&gt; [:dist, :min, :doc, :package, :clean_package_source]
+task :default =&gt; [:clean, :dist, :unified, :doc, :package, :clean_package_source]
+
+desc &quot;Clean the distribution directory.&quot;
+task :clean do 
+  rm_rf SCRIPTY2_DIST_DIR
+  mkdir SCRIPTY2_DIST_DIR
+  mkdir SCRIPTY2_DEBUG_DIR
+  mkdir SCRIPTY2_RELEASE_DIR
+end
 
 desc &quot;Builds the distribution.&quot;
 task :dist do
   sprocketize(&quot;src&quot;, &quot;s2.js&quot;)
-  cp File.join(SCRIPTY2_ROOT,'lib','prototype.js'), File.join(SCRIPTY2_DIST_DIR,'prototype.js')
+  cp File.join(SCRIPTY2_ROOT,'lib','prototype.js'), File.join(SCRIPTY2_DEBUG_DIR,'prototype.js')
 end
 
 def minify(src, target)
   puts &quot;Minifying #{src}...&quot;
   `java -jar vendor/yuicompressor/yuicompressor-2.4.2.jar #{src} -o #{target}`
-  cp target, File.join(SCRIPTY2_DIST_DIR,'temp.js')
-  msize = File.size(File.join(SCRIPTY2_DIST_DIR,'temp.js'))
-  `gzip -9 #{File.join(SCRIPTY2_DIST_DIR,'temp.js')}`
+  cp target, File.join(SCRIPTY2_DEBUG_DIR,'temp.js')
+  msize = File.size(File.join(SCRIPTY2_DEBUG_DIR,'temp.js'))
+  `gzip -9 #{File.join(SCRIPTY2_DEBUG_DIR,'temp.js')}`
   
   osize = File.size(src)
-  dsize = File.size(File.join(SCRIPTY2_DIST_DIR,'temp.js.gz'))
-  rm_rf File.join(SCRIPTY2_DIST_DIR,'temp.js.gz')
+  dsize = File.size(File.join(SCRIPTY2_DEBUG_DIR,'temp.js.gz'))
+  rm_rf File.join(SCRIPTY2_DEBUG_DIR,'temp.js.gz')
   
   puts &quot;Original version: %.1fk&quot; % (osize/1024.0)
   puts &quot;Minified: %.1fk&quot; % (msize/1024.0)
@@ -60,10 +72,18 @@ end
 
 desc &quot;Generates a minified version of the distribution.&quot;
 task :min do
-  minify File.join(SCRIPTY2_DIST_DIR,'s2.js'), File.join(SCRIPTY2_DIST_DIR,'s2.min.js')
-  minify File.join(SCRIPTY2_ROOT,'lib','prototype.js'), File.join(SCRIPTY2_DIST_DIR,'prototype.min.js')
+  minify File.join(SCRIPTY2_DEBUG_DIR,'s2.js'), File.join(SCRIPTY2_RELEASE_DIR,'s2.min.js')
+  minify File.join(SCRIPTY2_ROOT,'lib','prototype.js'), File.join(SCRIPTY2_RELEASE_DIR,'prototype.min.js')
 end
 
+desc &quot;Generate a unified minified version of Prototype and scripty2&quot;
+task :unified =&gt; [:dist, :min] do
+  unified = IO.read(File.join(SCRIPTY2_DEBUG_DIR,'prototype.js')) + IO.read(File.join(SCRIPTY2_DEBUG_DIR,'s2.js'))
+  File.open(File.join(SCRIPTY2_DEBUG_DIR,'prototype.s2.js'), 'w') do |file|
+    file.write unified
+  end 
+  minify File.join(SCRIPTY2_DEBUG_DIR,'prototype.s2.js'), File.join(SCRIPTY2_DIST_DIR,'prototype.s2.min.js')
+end
 
 namespace :doc do
   desc &quot;Builds the documentation.&quot;</diff>
      <filename>Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@
  * ==  scripty2 fx ==
  * The scripty2 effects framework provides for time-based transformations of DOM elements
  * and arbitrary JavaScript objects. This is at the core of scripty2 and presents a refinement
- * of the visual effects framework of script.aculo.us 1.X.
+ * of the visual effects framework of script.aculo.us 1.
  *
  * In practice [[S2.FX.Morph]] is most often used, which allows transitions from one
  * set of CSS style rules to another.
@@ -14,6 +14,8 @@
  *   support for all CSS length types (px, em, %, cm, pt, etc.)
  * * &lt;a href=&quot;scripty2%20fx/s2/fx/transitions.html&quot;&gt;Extensive transition system&lt;/a&gt;
  *   for animation easing and special effects (e.g. bouncing)
+ * * On supported browsers, uses browser-native visual effects (CSS Transitions),
+ *   fully automatically with no change to your code required
  * * Auto-adjusts to differences in computing and rendering speed (drops frames as necessary)
  * * Limits the number of attempted frame renders to conserve CPU in fast computers
  * * Flexible OOP-based implementation allows for easy extension and hacks</diff>
      <filename>src/effects/base.js</filename>
    </modified>
    <modified>
      <diff>@@ -37,7 +37,6 @@ var S2 = {
 
 //= require &quot;css&quot;
 //= require &quot;effects&quot;
-//= require &quot;ui&quot;
   
 //= require &quot;extensions/element&quot;
 </diff>
      <filename>src/s2.js</filename>
    </modified>
    <modified>
      <diff>@@ -6,23 +6,24 @@
   &lt;p&gt;Welcome to the scripty2 API Documentation.&lt;/p&gt;
   
   &lt;p&gt;
-    This complete rewrite of the venerable script.aculo.us
+    This rewrite of the script.aculo.us
     library is a prerelease alpha version and not meant for production use,
     although it is used in live projects like &lt;a href=&quot;http://twistori.com&quot;&gt;twistori&lt;/a&gt;
     and &lt;a href=&quot;http://letsfreckle.com&quot;&gt;freckle&lt;/a&gt; and it works great!).
   &lt;/p&gt;
-  
-  &lt;p style=&quot;color:red&quot;&gt;
-    The API is not final and subject to change!
-  &lt;/p&gt;
-  
+    
   &lt;p&gt;
-    &lt;b&gt;Note for alpha 1:&lt;/b&gt; This alpha release concentrates exclusively on the new effects engine.
+    &lt;b&gt;Note for alpha 1 &amp;amp; 2:&lt;/b&gt; This alpha release concentrates exclusively on the new effects engine.
   &lt;/p&gt;
   
   &lt;p&gt;
     scripty2 is divided into three parts, &lt;em&gt;core&lt;/em&gt;, &lt;em&gt;fx&lt;/em&gt;, and &lt;em&gt;ui&lt;/em&gt;.
   &lt;/p&gt;
+  
+  &lt;p style=&quot;color:red&quot;&gt;
+    The API is not final and subject to change!
+  &lt;/p&gt;
+  
 &lt;/div&gt;
 
 
@@ -54,13 +55,18 @@
     &lt;ul class=&quot;section-list&quot;&gt;
       &lt;li&gt;
         &lt;p&gt;
-          scripty2 depends on Prototype 1.6.1_rc3 or later. For your convenience, a development copy
+          scripty2 depends on Prototype 1.6.1 or later. For your convenience, a development copy
           and a minified version of Prototype is included in the distribution.
         &lt;/p&gt;
         &lt;p&gt;
-          To use scripty2, include these lines in your HTML:
+          To use scripty2, include this line in your HTML:
+          &lt;pre&gt;&lt;code&gt;&amp;lt;script src=&amp;quot;prototype.scripty2.min.js&amp;quot; type=&amp;quot;text/javascript&amp;quot;&amp;gt;&amp;lt;/script&amp;gt;&lt;/code&gt;&lt;/pre&gt;
+        &lt;/p&gt;
+        &lt;p&gt;
+          For debugging, you can also include the libraries seperately:
           &lt;pre&gt;&lt;code&gt;&amp;lt;script src=&amp;quot;prototype.js&amp;quot; type=&amp;quot;text/javascript&amp;quot;&amp;gt;&amp;lt;/script&amp;gt;
-&amp;lt;script src=&amp;quot;s2.js&amp;quot; type=&amp;quot;text/javascript&amp;quot;&amp;gt;&amp;lt;/script&amp;gt;&lt;/code&gt;&lt;/pre&gt;
+&amp;lt;script src=&amp;quot;s2.js&amp;quot; type=&amp;quot;text/javascript&amp;quot;&amp;gt;&amp;lt;/script&amp;gt;
+          &lt;/code&gt;&lt;/pre&gt;
         &lt;/p&gt;
       &lt;/li&gt;
     &lt;/ul&gt;</diff>
      <filename>templates/html/index.erb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>dist/.gitignore</filename>
    </removed>
    <removed>
      <filename>src/ui.js</filename>
    </removed>
    <removed>
      <filename>src/ui/dragdrop.js</filename>
    </removed>
    <removed>
      <filename>src/ui/dragdrop/draggable.js</filename>
    </removed>
    <removed>
      <filename>src/ui/dragdrop/droppable.js</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>bfc8d7f959b407ddac58a68e4e3762e624550a15</id>
    </parent>
  </parents>
  <author>
    <name>Thomas Fuchs</name>
    <email>thomas@fesch.at</email>
  </author>
  <url>http://github.com/madrobby/scripty2/commit/0ff7fd8ee788fc60e78019941a0050b68e4c2bb0</url>
  <id>0ff7fd8ee788fc60e78019941a0050b68e4c2bb0</id>
  <committed-date>2009-09-29T01:54:49-07:00</committed-date>
  <authored-date>2009-09-29T01:54:49-07:00</authored-date>
  <message>cleanups. add a basic demo file as root for future expansion. generate a concatenated version of prototype and scripty2 for ease of use</message>
  <tree>46e0840ff2911599dacd35209a54d092509024f2</tree>
  <committer>
    <name>Thomas Fuchs</name>
    <email>thomas@fesch.at</email>
  </committer>
</commit>
