diff --git a/README.md b/README.md index 8ff3cb9..c171394 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,8 @@ idea... * Android tablets ARE considered modern; Ipad/Iphone too. * I haven't tested on MorphOS yet. +For Chrome/Chromium: + To use with _local_ files you need to run your browser in "developer" mode, that means: @@ -68,19 +70,15 @@ explaining how to do this and alternatives here: https://github.com/mrdoob/three.js/wiki/How-to-run-things-locally -As you can see from that, as of right now (September 2016) -if you're using Firefox, you should be EXTREMELY CAREFUL and be -100% SURE YOU CHANGE THE SETTING BACK! +Firefox (and Icecat, possibly other Firefox codebased browsers) +seem to work today (Sept 2016) _without_ making any changes, so +you can use it 'out of the box.' M0qui was able to, and I tested, +and so the big 72-point "not supported on Windows+Firefox" warning +goes away. -** ESPECIALLY ON WINDOWS FOR CRYING OUT LOUD ** - -Look if you're using Windows and Firefox to use this, and _YOU_ -don't set the setting back, YOU ARE GOING TO GET FUCKED. - -BECAUSE OF THIS: I DO NOT RECCOMEND, OR SUPPORT, RUNNING THIS -ON WINDOWS AND FIREFOX. It works. I do not RECCOMEND it or -support it. Someone is going to come back and fuck me over -because of their stupidity and choice of OS. Fuck that. +Again, DON'T FREAKING TURN OFF JAVASCRIPT SECURITY AND FORGET TO +TURN IT BACK ON. DON'T. NOT JUST ON WINDOWS. BUT ESPECIALLY ON +WINDOWS. I may be able to turn this into a chrome app at some point, which will eliminate that issue. Possibly also a Firefox solution, but: diff --git a/editor/sahliedit.js b/editor/sahliedit.js index 678a60e..45237d7 100644 --- a/editor/sahliedit.js +++ b/editor/sahliedit.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.7.1 +// Generated by CoffeeScript 1.11.0 (function() { var Sahli, ansiorascii, arraytocolor, booltoint, colorindex, colortoarray, colortoname, dec2hex, dumpjson, emptyfiledef, getfilelist, hex2dec, inttobool, loadsahli, newsahli, resolvefiletype, sahlicolor, statustobool; @@ -163,19 +163,19 @@ }; Sahli.prototype.buildlist = function(data) { - var i, item, x, _i, _j, _len, _len1, _ref, _ref1; + var i, item, j, k, len, len1, ref, ref1, x; $('#list').show(100); $('#list ol li').remove(); - _ref = this.data.filedata; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - i = _ref[_i]; + ref = this.data.filedata; + for (j = 0, len = ref.length; j < len; j++) { + i = ref[j]; console.log(i.author); } x = 0; $('#dirlocation').val(this.data.location); - _ref1 = this.data.filedata; - for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { - item = _ref1[_j]; + ref1 = this.data.filedata; + for (k = 0, len1 = ref1.length; k < len1; k++) { + item = ref1[k]; $('#sortlist').append(this.additem(item, x++)); } return $('#sortlist').sortable({ @@ -186,13 +186,13 @@ }, stop: (function(_this) { return function(event, ui) { - var e, name, s, _k, _len2, _ref2; + var e, l, len2, name, ref2, s; s = ui.item.data().startpos; e = ui.item.index(); _this.data.filedata = _this.rearrangearray(s, e, _this.data.filedata); - _ref2 = _this.data.filedata; - for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) { - name = _ref2[_k]; + ref2 = _this.data.filedata; + for (l = 0, len2 = ref2.length; l < len2; l++) { + name = ref2[l]; console.log(name.author, name.name, name.file); } console.log('---'); @@ -367,13 +367,13 @@ arraytocolor = function(array) { var c, x; c = ((function() { - var _i, _len, _results; - _results = []; - for (_i = 0, _len = array.length; _i < _len; _i++) { - x = array[_i]; - _results.push(dec2hex(x)); + var j, len, results; + results = []; + for (j = 0, len = array.length; j < len; j++) { + x = array[j]; + results.push(dec2hex(x)); } - return _results; + return results; })()).slice(0, 3).join(''); return "#" + c; }; @@ -383,13 +383,13 @@ color = color.slice(1); c1 = [color.slice(0, 2), color.slice(2, 4), color.slice(4, 6)]; x = (function() { - var _i, _len, _results; - _results = []; - for (_i = 0, _len = c1.length; _i < _len; _i++) { - i = c1[_i]; - _results.push(hex2dec(i)); + var j, len, results; + results = []; + for (j = 0, len = c1.length; j < len; j++) { + i = c1[j]; + results.push(hex2dec(i)); } - return _results; + return results; })(); x.push(255); return x; diff --git a/sahli.js b/sahli.js index d3f2c48..a80b989 100644 --- a/sahli.js +++ b/sahli.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.9.3 +// Generated by CoffeeScript 1.11.0 /* .___________________________________, ___ @@ -173,28 +173,13 @@ l__________/__________|___|______l__________j_____j }; Sahli.prevpic = function() { - var filedata, i, viewbox; - viewbox = $('div#sahliviewer'); - viewbox.children().remove(); - $('#panel').empty(); - Sahli.scroll_direction = 1; - Sahli.scroll_speed = 5; - filedata = Sahli.filedata; + var i; i = Sahli.currentpic - 2; if (i < 0) { - i = i + filedata.length; + i = i + Sahli.filedata.length; } - filedata[i].pic = $('
' + filedata[i].file + '
'); - viewbox.append(filedata[i].pic); - Sahli.loadpic(filedata[i], filedata[i].pic); - Sahli.currentpic = i + 1; - if (Sahli.currentpic > filedata.length - 1) { - Sahli.currentpic = 0; - } - $('#panel').hide(); - $('#outbox').show(); - $('body').stop(); - return Sahli.loadinfopanel(i); + Sahli.currentpic = i; + return Sahli.nextpic(); }; Sahli.togglefullscreen = function() {