Skip to content

Commit

Permalink
v0.5.0 React v0.14+ support, resolve #17
Browse files Browse the repository at this point in the history
  • Loading branch information
dmythro committed Nov 26, 2015
1 parent 758a67d commit 2783f7b
Show file tree
Hide file tree
Showing 63 changed files with 41,444 additions and 73,724 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scrolly",
"version": "0.4.6",
"version": "0.5.0",
"description": "Scrolly: fast vanilla JS scrollbar plugin.",
"keywords": [
"scroll", "scrollbar", "scrolly", "bar",
Expand All @@ -13,7 +13,7 @@
},
"devDependencies": {
"jbone": "*",
"react": "^0.12.1"
"react": "^0.14.3"
},
"ignore": [
".gitignore",
Expand Down
3 changes: 2 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ gulp.task('vendor', function () {
*/
gulp.task('vendor-react', function () {
return gulp.src([
vendor('react/react.js')
vendor('react/react.js'),
vendor('react/react-dom.js')
])
.pipe(gulp.dest(paths.js));
});
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scrolly",
"version": "0.4.6",
"version": "0.5.0",
"description": "Scrolly: fast vanilla JS scrollbar plugin.",
"keywords": [
"scroll", "scrollbar", "scrolly", "bar",
Expand All @@ -23,7 +23,7 @@
"gulp-less": "*",
"gulp-livereload": "*",
"gulp-plumber": "*",
"gulp-react": "^2.0",
"gulp-react": "^3.1",
"gulp-rename": "*",
"gulp-uglify": "*",
"gulp-wrapper": "*",
Expand Down
4 changes: 2 additions & 2 deletions public/css/styles-example.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
body{font-family:"Helvetica Neue",Arial,Helvetica,sans-serif;font-size:12px}article{clear:both;float:none;padding:.2em 1em}.scrolly{float:left;width:25%;height:400px}.scrolly>.area.test1{background:#f2e4d8}.scrolly>.area.test1.scrolly.area+.bar{background:#808ca6}.scrolly>.area.test1.scrolly.area+.bar .thumb{background:#283d59}.scrolly .scrolly{background:rgba(0,0,0,0.1);width:100%}
body{font-family:"Helvetica Neue",Arial,Helvetica,sans-serif;font-size:12px}article{clear:both;float:none;padding:.2em 1em}.scrolly{float:left;width:25%;height:400px}.scrolly>.area.test1{background:#F2E4D8}.scrolly>.area.test1.scrolly.area+.bar{background:#808CA6}.scrolly>.area.test1.scrolly.area+.bar .thumb{background:#283D59}.scrolly .scrolly{background:rgba(0,0,0,0.1);width:100%}

/* scrolly v0.4.6, 2015.01.12 */
/* scrolly v0.5.0, 2015.11.26 */
2 changes: 1 addition & 1 deletion public/css/styles-scrolly.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions public/js/react-dom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/**
* ReactDOM v0.14.3
*
* Copyright 2013-2015, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
*/
// Based off https://github.com/ForbesLindesay/umd/blob/master/template.js
;(function(f) {
// CommonJS
if (typeof exports === "object" && typeof module !== "undefined") {
module.exports = f(require('react'));

// RequireJS
} else if (typeof define === "function" && define.amd) {
define(['react'], f);

// <script>
} else {
var g
if (typeof window !== "undefined") {
g = window;
} else if (typeof global !== "undefined") {
g = global;
} else if (typeof self !== "undefined") {
g = self;
} else {
// works providing we're not in "use strict";
// needed for Java 8 Nashorn
// see https://github.com/facebook/react/issues/3037
g = this;
}
g.ReactDOM = f(g.React);
}

})(function(React) {
return React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
});
100 changes: 100 additions & 0 deletions public/js/react-scrolly-test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions public/js/react-scrolly.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* scrolly v0.4.6, 2015.01.12 */
/* scrolly v0.5.0, 2015.11.26 */
var dataSet = function initDataSet() {
if (document.documentElement.dataset) {
return function native(el, prop, value) {
Expand Down Expand Up @@ -524,8 +524,9 @@ var Scrolly = React.createClass({displayName: "Scrolly",
return;
}

// test
this.id = scrolly.barNode(
this.refs.area.getDOMNode(),
this.refs.area,
this.props.params
);
},
Expand Down
Loading

0 comments on commit 2783f7b

Please sign in to comment.