Permalink
Browse files

turn on stylus. fix some issue with browserify

  • Loading branch information...
1 parent 532c180 commit 6e7ee6f26c0cf14d2ed071ea6151434dae031e9a Ian Johnson committed Aug 23, 2013
View
@@ -29,7 +29,8 @@
"d3":"3.1.4",
"inlet":"git://github.com/enjalot/Inlet.git",
"underscore":"1.4.4",
- "jquery":"1.8.3",
+ "jquery":"*",
+ "jquery-browserify":"*",
"backbone":"1.0.0",
"codemirror":"3.11.01",
"queue-async": "1.0.1",
@@ -130,6 +130,8 @@
<script src="/static/lib/coffee-script.js"></script>
<script src="/static/lib/jsonlint.js"></script>
+<script src="/static/lib/stylus.js"></script>
+
<!-- three.js should probably be done as a plugin -->
<!--<script src="/static/lib/three.min.js"></script>-->
<script src="/static/lib/three.js"></script>
@@ -189,16 +191,19 @@ tb.events.on("loaded", function() {
tb.events.trigger("execute");
}
);
+ tb.loadPlugin("/static/plugins/tb-screenshot-plugin/plugin.json", {},
+ function(e) { /*console.log("callback: ",e); */}
+ );
+ tb.loadPlugin("/static/plugins/stylus/plugin.json", {},
+ function(e) { /*console.log("callback: ",e); */}
+ );
/*
//example simple plugin
tb.loadPlugin("/static/plugins/simple/plugin.json"
, {}
, function (err) { console.log("plugin load err?", err) }
);
*/
- tb.loadPlugin("/static/plugins/tb-screenshot-plugin/plugin.json", {},
- function(e) { /*console.log("callback: ",e); */}
- );
})
Oops, something went wrong.
View
@@ -2,8 +2,10 @@
var d3 = require('d3');
var queue = require('queue-async');
+//var $ = require('jquery-browserify')
var _ = require('underscore');
var Backbone = require('backbone');
+Backbone.$ = $;
var Inlet = require('inlet');
var cm = require('CodeMirror');
//Third party includes the codemirror modes and addons, as well as jshint
View
@@ -1,3 +1,4 @@
var Backbone = require('backbone');
+Backbone.$ = $;
TributaryUi = function(tributary) {
View
@@ -106,6 +106,12 @@ Tributary.makeContext = function(options) {
config: config,
model: model,
});
+ } else if(type === "styl") {
+ model.set("mode", "stylus")
+ context = new tributary.StylusContext({
+ config: config,
+ model: model,
+ });
} else if(type === "html") {
model.set("mode", "text/html")
context = new tributary.HTMLContext({
@@ -142,10 +148,10 @@ Tributary.makeContext = function(options) {
}
-d3.selection.prototype.moveToFront = function() {
- return this.each(function() {
- this.parentNode.appendChild(this);
- });
+d3.selection.prototype.moveToFront = function() {
+ return this.each(function() {
+ this.parentNode.appendChild(this);
+ });
};
@@ -566,6 +566,8 @@ px 68 160 252 344 436 528 620 712 804 896 */
/*background-color: #ffffff;*/
+ /*background-color: #ffffff;*/
+
background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(255, 255, 255, 0)), to(rgba(66, 66, 66, 0.6)));
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), rgba(66, 66, 66, 0.6));
background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0), rgba(66, 66, 66, 0.6));
View
@@ -283,6 +283,7 @@
setThumbnail(image);
} else {
//oops
+ getConfig();
}
})
}
Oops, something went wrong.

0 comments on commit 6e7ee6f

Please sign in to comment.