From 46d0c8d43d891add19f928e1a9fdb73664be2c48 Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Sun, 11 Dec 2016 16:36:36 -0500 Subject: [PATCH] Initial commit --- README.md | 2 +- apps/scripts/follow | 1 + apps/scripts/moveTo | 1 + apps/scripts/summon | 1 + sys/apis/git.lua | 1 + sys/apis/ui.lua | 8 +++++--- 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 00bcb6e..b7f4cea 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# test \ No newline at end of file +# Opus OS for computercraft diff --git a/apps/scripts/follow b/apps/scripts/follow index 7fa08d8..b7ba73c 100644 --- a/apps/scripts/follow +++ b/apps/scripts/follow @@ -1,5 +1,6 @@ local function follow(id) + require = requireInjector(getfenv(1)) local GPS = require('gps') local Socket = require('socket') local Point = require('point') diff --git a/apps/scripts/moveTo b/apps/scripts/moveTo index df37201..0ca0caf 100644 --- a/apps/scripts/moveTo +++ b/apps/scripts/moveTo @@ -1,4 +1,5 @@ turtle.run(function() + require = requireInjector(getfenv(1)) local GPS = require('gps') local Socket = require('socket') diff --git a/apps/scripts/summon b/apps/scripts/summon index 21b0818..0c00e07 100644 --- a/apps/scripts/summon +++ b/apps/scripts/summon @@ -1,5 +1,6 @@ local function summon(id) + require = requireInjector(getfenv(1)) local GPS = require('gps') local Socket = require('socket') local Point = require('point') diff --git a/sys/apis/git.lua b/sys/apis/git.lua index bfe0929..ccaaf5f 100644 --- a/sys/apis/git.lua +++ b/sys/apis/git.lua @@ -1,4 +1,5 @@ local json = require('json') +local Util = require('util') local TREE_URL = 'https://api.github.com/repos/%s/%s/git/trees/%s?recursive=1' local FILE_URL = 'https://raw.github.com/%s/%s/%s/%s' diff --git a/sys/apis/ui.lua b/sys/apis/ui.lua index 58c5e1c..7b690fc 100644 --- a/sys/apis/ui.lua +++ b/sys/apis/ui.lua @@ -1590,9 +1590,11 @@ end function UI.ViewportWindow:setScrollPosition(offset) local oldOffset = self.offy self.offy = math.max(offset, 0) - local max = self.height - for _, child in ipairs(self.children) do - max = math.max(child.y + child.height - 1, max) + local max = self.ymax or self.height + if self.children then + for _, child in ipairs(self.children) do + max = math.max(child.y + child.height - 1, max) + end end self.offy = math.min(self.offy, max - self.height) if self.offy ~= oldOffset then