From: Dan Vanderkam <dan@dygraphs.com>
Date: Fri, 11 May 2012 18:19:29 +0000 (-0400)
Subject: Merge branch 'resize_label' of https://github.com/beda42/dygraphs into pull146
X-Git-Tag: v1.0.0~275
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=12483d3eadbb0e385c7a3c773bc962cc543a19f8;hp=0673f7c46a068308743a73c2cc92876108c8336b;p=dygraphs.git

Merge branch 'resize_label' of https://github.com/beda42/dygraphs into pull146
---

diff --git a/dygraph-range-selector.js b/dygraph-range-selector.js
index fd50bd0..9a28aa9 100644
--- a/dygraph-range-selector.js
+++ b/dygraph-range-selector.js
@@ -1,5 +1,8 @@
-// Copyright 2011 Paul Felix (paul.eric.felix@gmail.com)
-// All Rights Reserved.
+/*
+ * @license
+ * Copyright 2011 Paul Felix (paul.eric.felix@gmail.com)
+ * MIT-licensed (http://opensource.org/licenses/MIT)
+ */
 
 /**
  * @fileoverview This file contains the DygraphRangeSelector class used to provide
diff --git a/generate-combined.sh b/generate-combined.sh
index 038aff8..304b1cf 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -25,9 +25,8 @@ plugins/install.js \
 java -jar yuicompressor-2.4.2.jar /tmp/dygraph.js \
 > /tmp/dygraph-packed.js
 
-# TODO(danvk): ensure the dygraphs copyright, etc. gets into the packed js.
-
-cat \
-/tmp/dygraph-packed.js \
-> dygraph-combined.js
+(
+  echo '/*! dygraphs v1.2 dygraphs.com | dygraphs.com/license */'
+  cat /tmp/dygraph-packed.js
+) > dygraph-combined.js
 chmod a+r dygraph-combined.js
diff --git a/plugins/legend.js b/plugins/legend.js
index d63f080..f5f4711 100644
--- a/plugins/legend.js
+++ b/plugins/legend.js
@@ -1,3 +1,9 @@
+/**
+ * @license
+ * Copyright 2012 Dan Vanderkam (danvdk@gmail.com)
+ * MIT-licensed (http://opensource.org/licenses/MIT)
+ */
+
 Dygraph.Plugins.Legend = (function() {
 
 /*
diff --git a/push-to-web.sh b/push-to-web.sh
index 422f0fd..4bf1b89 100755
--- a/push-to-web.sh
+++ b/push-to-web.sh
@@ -9,6 +9,7 @@ fi
 
 set -x
 site=$1
+
 # Produce dygraph-combined.js.
 ./generate-combined.sh
 
@@ -18,6 +19,10 @@ chmod a+r docs/options.html
 if [ -s docs/options.html ] ; then
   ./generate-jsdoc.sh
 
+  # Make sure everything will be readable on the web.
+  # This is like "chmod -R a+rX", but excludes the .git directory.
+  find . -path ./.git -prune -o -print | xargs chmod a+rX
+
   # Copy everything to the site.
   rsync -avzr gallery common tests jsdoc experimental plugins $site \
   && \