maxiaoshan 4 年之前
父節點
當前提交
079cf6b47f
共有 100 個文件被更改,包括 32 次插入22056 次删除
  1. 0 10
      README.md
  2. 0 37
      areacity.json
  3. 0 43
      autoimport.json
  4. 0 101
      config.json
  5. 0 18
      filter/filter.go
  6. 0 42
      filter/sessfilter.go
  7. 0 208
      finishtime/finishtime.go
  8. 0 104
      finishtime/finsh.go
  9. 0 934
      front/front.go
  10. 0 358
      front/luamove.go
  11. 0 1332
      front/spider.go
  12. 0 480
      luaerrdata/errdata.go
  13. 0 44
      luaerrdata/mapvaluesort.go
  14. 0 118
      main.go
  15. 0 190
      main_test.go
  16. 0 323
      quesManager/quesManager.go
  17. 0 113
      res/spider_test.lua
  18. 0 751
      res/util/comm.lua
  19. 0 79
      res/util/ecps.lua
  20. 0 417
      res/util/json.lua
  21. 0 281
      spider/download.go
  22. 0 215
      spider/msclient.go
  23. 0 503
      spider/script.go
  24. 0 348
      spider/service.go
  25. 0 9
      spider/single_test.go
  26. 0 245
      spider/spider.go
  27. 1 1
      src/filter/sessfilter.go
  28. 3 3
      src/front/front.go
  29. 2 2
      src/front/luamove.go
  30. 3 3
      src/front/spider.go
  31. 3 3
      src/luaerrdata/errdata.go
  32. 10 10
      src/main.go
  33. 1 1
      src/spider/download.go
  34. 1 1
      src/spider/script.go
  35. 1 1
      src/spider/service.go
  36. 1 1
      src/spider/spider.go
  37. 3 3
      src/taskManager/taskManager.go
  38. 1 1
      src/tomail/sendmail.go
  39. 1 1
      src/udp/udp.go
  40. 1 1
      src/util/util.go
  41. 0 57
      task/flush.go
  42. 0 1241
      taskManager/taskManager.go
  43. 0 157
      tomail/sendmail.go
  44. 0 4
      transfercode.json
  45. 0 37
      udp/udp.go
  46. 0 190
      util/util.go
  47. 0 347
      web/staticres/codemirror/codemirror.css
  48. 0 8935
      web/staticres/codemirror/codemirror.js
  49. 0 271
      web/staticres/codemirror/docs.css
  50. 0 41
      web/staticres/codemirror/fullscreen.js
  51. 0 146
      web/staticres/codemirror/javascript-hint.js
  52. 0 743
      web/staticres/codemirror/javascript.js
  53. 0 159
      web/staticres/codemirror/lua.js
  54. 0 36
      web/staticres/codemirror/show-hint.css
  55. 0 438
      web/staticres/codemirror/show-hint.js
  56. 0 41
      web/staticres/codemirror/theme/3024-day.css
  57. 0 39
      web/staticres/codemirror/theme/3024-night.css
  58. 0 32
      web/staticres/codemirror/theme/abcdef.css
  59. 0 5
      web/staticres/codemirror/theme/ambiance-mobile.css
  60. 0 72
      web/staticres/codemirror/theme/ambiance.css
  61. 0 38
      web/staticres/codemirror/theme/base16-dark.css
  62. 0 38
      web/staticres/codemirror/theme/base16-light.css
  63. 0 34
      web/staticres/codemirror/theme/bespin.css
  64. 0 32
      web/staticres/codemirror/theme/blackboard.css
  65. 0 25
      web/staticres/codemirror/theme/cobalt.css
  66. 0 33
      web/staticres/codemirror/theme/colorforth.css
  67. 0 41
      web/staticres/codemirror/theme/dracula.css
  68. 0 23
      web/staticres/codemirror/theme/eclipse.css
  69. 0 13
      web/staticres/codemirror/theme/elegant.css
  70. 0 34
      web/staticres/codemirror/theme/erlang-dark.css
  71. 0 34
      web/staticres/codemirror/theme/hopscotch.css
  72. 0 43
      web/staticres/codemirror/theme/icecoder.css
  73. 0 34
      web/staticres/codemirror/theme/isotope.css
  74. 0 47
      web/staticres/codemirror/theme/lesser-dark.css
  75. 0 95
      web/staticres/codemirror/theme/liquibyte.css
  76. 0 53
      web/staticres/codemirror/theme/material.css
  77. 0 37
      web/staticres/codemirror/theme/mbo.css
  78. 0 45
      web/staticres/codemirror/theme/mdn-like.css
  79. 0 45
      web/staticres/codemirror/theme/midnight.css
  80. 0 36
      web/staticres/codemirror/theme/monokai.css
  81. 0 12
      web/staticres/codemirror/theme/neat.css
  82. 0 43
      web/staticres/codemirror/theme/neo.css
  83. 0 27
      web/staticres/codemirror/theme/night.css
  84. 0 94
      web/staticres/codemirror/theme/panda-syntax.css
  85. 0 38
      web/staticres/codemirror/theme/paraiso-dark.css
  86. 0 38
      web/staticres/codemirror/theme/paraiso-light.css
  87. 0 53
      web/staticres/codemirror/theme/pastel-on-dark.css
  88. 0 34
      web/staticres/codemirror/theme/railscasts.css
  89. 0 25
      web/staticres/codemirror/theme/rubyblue.css
  90. 0 44
      web/staticres/codemirror/theme/seti.css
  91. 0 169
      web/staticres/codemirror/theme/solarized.css
  92. 0 30
      web/staticres/codemirror/theme/the-matrix.css
  93. 0 35
      web/staticres/codemirror/theme/tomorrow-night-bright.css
  94. 0 38
      web/staticres/codemirror/theme/tomorrow-night-eighties.css
  95. 0 64
      web/staticres/codemirror/theme/ttcn.css
  96. 0 32
      web/staticres/codemirror/theme/twilight.css
  97. 0 34
      web/staticres/codemirror/theme/vibrant-ink.css
  98. 0 53
      web/staticres/codemirror/theme/xq-dark.css
  99. 0 43
      web/staticres/codemirror/theme/xq-light.css
  100. 0 44
      web/staticres/codemirror/theme/yeti.css

+ 0 - 10
README.md

@@ -1,10 +0,0 @@
-------------------2016.11-----------------
-权限控制:
-			管理员(2)		内部员工(1)		外部员工(0)
-导入/新建		  √			  	 	-		  		-
-编辑爬虫		  √		 	  	只能编辑自己		只能编辑自己
-删除爬虫		  √			   		-          		-
-保存/下载		  √			   		√	       		√	
-上传	 		  √			   		√	       		-
-打回			  √			   		√		   		√
-查看			  √		   		只能查看自己		只能查看自己

+ 0 - 37
areacity.json

@@ -1,37 +0,0 @@
-{
-    "全国": [],
-    "安徽": ["马鞍山市","滁州市","宿州市","宣城市","合肥市","六安市","铜陵市","黄山市","芜湖市","蚌埠市","淮北市","池州市","亳州市","安庆市","阜阳市","淮南市"],
-    "北京": ["北京市"],
-    "福建": ["厦门市","三明市","莆田市","南平市","福州市","龙岩市","泉州市","宁德市","漳州市"],
-    "甘肃": ["金昌市","嘉峪关市","陇南市","平凉市","天水市","兰州市","白银市","张掖市","临夏回族自治州","武威市","定西市","酒泉市","庆阳市","甘南藏族自治州"],
-    "广东": ["东莞市","中山市","云浮市","佛山市","广州市","惠州市","揭阳市","梅州市","汕头市","汕尾市","江门市","河源市","深圳市","清远市","湛江市","潮州市","珠海市","肇庆市","茂名市","阳江市","韶关市"],
-    "广西": ["北海市","南宁市","崇左市","来宾市","柳州市","桂林市","梧州市","河池市","玉林市","百色市","贵港市","贺州市","钦州市","防城港市"],
-    "贵州": ["六盘水市","安顺市","毕节市","贵阳市","遵义市","铜仁市","黔东南苗族侗族自治州","黔南布依族苗族自治州","黔西南布依族苗族自治州"],
-    "海南": ["万宁市","三亚市","三沙市","东方市","临高县","乐东黎族自治县","五指山市","保亭黎族苗族自治县","儋州市","定安县","屯昌县","文昌市","昌江黎族自治县","海口市","澄迈县","琼中黎族苗族自治县","琼海市","白沙黎族自治县","陵水黎族自治县"],
-    "河北": ["保定市","唐山市","廊坊市","张家口市","承德市","沧州市","石家庄市","秦皇岛市","衡水市","邢台市","邯郸市"],
-    "河南": ["郑州市","开封市","洛阳市","信阳市","三门峡市","南阳市","周口市","商丘市","安阳市","平顶山市","新乡市","济源市","漯河市","濮阳市","焦作市","许昌市","驻马店市","鹤壁市"],
-    "黑龙江": ["七台河市","伊春市","佳木斯市","双鸭山市","哈尔滨市","大兴安岭地区","大庆市","牡丹江市","绥化市","鸡西市","鹤岗市","黑河市","齐齐哈尔市"],
-    "湖北": ["仙桃市","十堰市","咸宁市","天门市","孝感市","宜昌市","恩施土家族苗族自治州","武汉市","潜江市","神农架林区","荆州市","荆门市","襄阳市","鄂州市","随州市","黄冈市","黄石市"],
-    "湖南": ["娄底市","岳阳市","常德市","张家界市","怀化市","株洲市","永州市","湘潭市","湘西土家族苗族自治州","益阳市","衡阳市","邵阳市","郴州市","长沙市"],
-    "吉林": ["吉林市","四平市","延边朝鲜族自治州","松原市","白城市","白山市","辽源市","通化市","长春市"],
-    "江苏": ["南京市","南通市","宿迁市","常州市","徐州市","扬州市","无锡市","泰州市","淮安市","盐城市","苏州市","连云港市","镇江市"],
-    "江西": ["上饶市","九江市","南昌市","吉安市","宜春市","抚州市","新余市","景德镇市","萍乡市","赣州市","鹰潭市"],
-    "辽宁": ["丹东市","大连市","抚顺市","朝阳市","本溪市","沈阳市","盘锦市","营口市","葫芦岛市","辽阳市","铁岭市","锦州市","阜新市","鞍山市"],
-    "内蒙古": ["乌兰察布市","乌海市","兴安盟","包头市","呼伦贝尔市","呼和浩特市","巴彦淖尔市","赤峰市","通辽市","鄂尔多斯市","锡林郭勒盟","阿拉善盟"],
-    "宁夏": ["中卫市","吴忠市","固原市","石嘴山市","银川市"],
-    "青海": ["果洛藏族自治州","海东市","海北藏族自治州","海南藏族自治州","海西蒙古族藏族自治州","玉树藏族自治州","西宁市","黄南藏族自治州"],
-    "山东": ["东营市","临沂市","威海市","德州市","日照市","枣庄市","泰安市","济南市","济宁市","淄博市","滨州市","潍坊市","烟台市","聊城市","菏泽市","青岛市"],
-    "山西": ["临汾市","吕梁市","大同市","太原市","忻州市","晋中市","晋城市","朔州市","运城市","长治市","阳泉市"],
-    "陕西": ["咸阳市","商洛市","安康市","宝鸡市","延安市","榆林市","汉中市","渭南市","西安市","铜川市"],
-    "上海": ["上海市"],
-    "四川": ["乐山市","内江市","凉山彝族自治州","南充市","宜宾市","巴中市","广元市","广安市","德阳市","成都市","攀枝花市","泸州市","甘孜藏族自治州","眉山市","绵阳市","自贡市","资阳市","达州市","遂宁市","阿坝藏族羌族自治州","雅安市"],
-    "天津": ["天津市"],
-    "西藏": ["山南市","拉萨市","日喀则市","昌都市","林芝市","那曲市","阿里地区"],
-    "新疆": ["乌鲁木齐市","五家渠市","伊犁哈萨克自治州","克孜勒苏柯尔克孜自治州","克拉玛依市","博尔塔拉蒙古自治州","吐鲁番市","和田地区","哈密市","喀什地区","图木舒克市","塔城地区","巴音郭楞蒙古自治州","昌吉回族自治州","石河子市","铁门关市","阿克苏地区","阿勒泰地区","阿拉尔市"],
-    "云南": ["临沧市","丽江市","保山市","大理白族自治州","德宏傣族景颇族自治州","怒江傈僳族自治州","文山壮族苗族自治州","昆明市","昭通市","普洱市","曲靖市","楚雄彝族自治州","玉溪市","红河哈尼族彝族自治州","西双版纳傣族自治州","迪庆藏族自治州"],
-    "浙江": ["丽水市","台州市","嘉兴市","宁波市","杭州市","温州市","湖州市","绍兴市","舟山市","衢州市","金华市"],
-    "重庆": ["重庆市"],
-    "香港": [],
-    "澳门": [],
-    "台湾": []
-}

+ 0 - 43
autoimport.json

@@ -1,43 +0,0 @@
-{
-    "Base.SpiderName": "",
-    "Base.SpiderCode": "",
-    "Base.SpiderChannel": "",
-    "Base.SpiderDownDetailPage": true,
-    "Base.SpiderStartPage": 1,
-    "Base.SpiderMaxPage": 1,
-    "Base.Spider2Collection": "",
-    "Base.SpiderPageEncoding": "utf8",
-    "Base.spiderLastDownloadTime": "2016-09-01 00:00:00",
-    "Base.SpiderStoreMode": 1,
-    "Base.SpiderStoreToMsgEvent": 4002,
-    "Base.SpiderRunRate": 30,
-    "Base.SpiderTargetChannelUrl": "",
-	"Base.SpiderIsHistoricalMend": false,
-	"Base.SpiderIsMustDownload": false,
-    "model": "bid",
-    "area": "A",
-    "city": "",
-    "publishdept": "",
-    "type": "",
-    "Step1.Address": "",
-    "Step1.ContentChooser": "",
-    "Step1.DateFormat": "yyyyMMddHHmmss",
-    "Step1.Expert": "function getLastPublishTime()\n end",
-    "Step1.types": 0,
-    "Step2.types": 0,
-    "Step3.types": 0,
-    "Step2.Listadd": "",
-    "Step2.Listadds": "",
-    "Step2.BlockChooser": "",
-    "Step2.AddressChooser": "",
-    "Step2.TitleChooser": "",
-    "Step2.DateChooser": "",
-    "Step2.DateFormat": "yyyyMMddHHmmss",
-    "Step2.Expert": "function downloadAndParseListPage(pageno) \n end",
-    "Step3.ContentChooser": "",
-    "Step3.ElementChooser": "",
-    "Step3.T_title": "",
-    "Step3.T_href": "",
-    "Step3.T_date": "2016-08-17 00:00:00",
-    "Step3.Expert": "function downloadDetailPage(data) \n end"
-}

+ 0 - 101
config.json

@@ -1,101 +0,0 @@
-{
-    "webport": "8002",
-    "dbaddr": "192.168.3.207:27092",
-    "dbname": "editor",
-    "dbname2": "spider",
-    "udport": 1499,
-    "udpaddr": "127.0.0.1",
-    "localudport": ":1498",
-    "redisservers": "title_repeat_judgement=192.168.3.18:2379",
-    "msgservers": {
-        "comm": {
-            "addr": "spdata.jianyu360.com:801",
-            "name": "编辑器_队列节点"
-        },
-        "bid": {
-            "addr": "spdata.jianyu360.com:803",
-            "name": "编辑器_并发节点"
-        },
-        "test": {
-            "addr": "spdata.jianyu360.com:805",
-            "name": "编辑器_测试"
-        }
-    },
-	"msgserveraddrfile": "spdata.jianyu360.com:802",
-    "msgname":"editor",
-    "uploadevents": {
-        "7100": "bid",
-        "7400": "bid",
-		"7000":	"bid",
-        "7200": "comm",
-        "7300": "comm",
-		"7210": "comm",
-        "7310": "comm",
-        "7700": "comm",
-        "7500": "comm"
-    },
-    "word":{
-    	"keyword":"(抽签|中标|招标|成交|合同|中标候选人|资格预审|拟建|邀请|询价|比选|议价|竞价|磋商|采购|招投标|答疑|变更公告|更正公告|竞争性谈判|竞谈|意见征询|澄清|单一来源|流标|废标|验收公告|中止|终止|违规|处罚|征集公告|开标结果|评审结果|监理|招租|租赁|评判结果|项目|遴选|补遗|竞标|征求意见|标段|定点结果|项目评审公示|采购项目违规|采购活动中违规|项目行政处罚|采购行政处罚|项目审批公示)",
-    	"notkeyword":"(招聘|拍卖|出租|出让|使用权|资产)"
-    },
-    "model": {
-        "bid": {
-            "type": "公告类型",
-            "area": "省份",
-            "city": "城市",
-            "district": "区/县",
-            "publishdept": "发布单位"
-        }
-    },
-    "oss":{
-    	"ossEndpoint":"oss-cn-beijing-internal.aliyuncs.com",
-		"ossAccessKeyId":"LTAI4G5x9aoZx8dDamQ7vfZi",  
-		"ossAccessKeySecret":"Bk98FsbPYXcJe72n1bG3Ssf73acuNh",
-		"ossBucketName":"jy-editor",
-		"ossUrl":"https://jy-editor.oss-cn-beijing.aliyuncs.com/"
-    },
-    "fileServer": "http://123.56.236.148:9333",
-    "jsvmurl": "http://127.0.0.1:8080/jsvm",
-    "luadisablelib": {
-        "baselib": {
-            "print": false
-        },
-        "oslib": {
-            "clock": false,
-            "difftime": true,
-            "execute": true,
-            "exit": true,
-            "date": false,
-            "getenv": true,
-            "remove": true,
-            "rename": true,
-            "setenv": true,
-            "setlocale": true,
-            "time": false,
-            "tmpname": false
-        },
-        "iolib": {
-            "close": false,
-            "flush": false,
-            "lines": true,
-            "input": true,
-            "output": true,
-            "open": true,
-            "popen": true,
-            "read": true,
-            "type": false,
-            "tmpfile": true,
-            "write": true
-        }
-    },
-    "jkmail": {
-	    "to": "maxiaoshan@topnet.net.cn,shishuncai@topnet.net.cn",
-	    "api": "http://172.17.145.179:19281/_send/_mail"
-	  },
-    "smtp": {
-        "host": "smtp.exmail.qq.com:25",
-        "from": "public03@topnet.net.cn",
-        "password": "Mu^$i21673",
-        "subject": "爬虫任务"
-    }
-} 

+ 0 - 18
filter/filter.go

@@ -1,18 +0,0 @@
-package filter
-
-import (
-	"log"
-	"regexp"
-
-	"github.com/go-xweb/xweb"
-)
-
-func init() {
-	log.Println("过滤器")
-	matchUrl := make([]*regexp.Regexp, 0)
-	filter, _ := regexp.Compile("/center")
-	matchUrl = append(matchUrl, filter)
-	xweb.AddFilter(&sessfilter{App: xweb.RootApp(), SessionName: "loginuser",
-		MatchUrl: matchUrl})
-
-}

+ 0 - 42
filter/sessfilter.go

@@ -1,42 +0,0 @@
-package filter
-
-import (
-	task "luaweb/taskManager"
-	"net/http"
-	"regexp"
-
-	"github.com/go-xweb/xweb"
-)
-
-//session过滤器
-type sessfilter struct {
-	App         *xweb.App
-	SessionName string
-	MatchUrl    []*regexp.Regexp
-}
-
-//实现过滤器方法
-func (s *sessfilter) Do(w http.ResponseWriter, req *http.Request) bool {
-	requestPath := req.URL.Path
-	b := true
-	for _, cr := range s.MatchUrl {
-		if !cr.MatchString(requestPath) {
-			continue
-		}
-		b = false
-		session := s.App.SessionManager.Session(req, w)
-		loginuser := session.Get(s.SessionName)
-		has := (loginuser != nil && loginuser != "")
-		if has {
-			b = true
-		} else {
-			b = false
-		}
-		break
-	}
-	if !b { //session失效
-		task.SessionFailuer = true
-		s.App.Redirect(w, requestPath, "/")
-	}
-	return b
-}

+ 0 - 208
finishtime/finishtime.go

@@ -1,208 +0,0 @@
-package finishtime
-
-import (
-	_ "log"
-	"qfw/util"
-	"time"
-
-	"github.com/tealeg/xlsx"
-)
-
-/*
-	time_two	紧急程度的时间的时间戳
-	timeNow		当前时间戳
-	unix_time	零点时间戳
-	finishtime  完成时间
-	timeInt
-	time_twelve
-	time_thirteen_thirty
-*/
-var time_two, timeNow, ret, unix_time, finishtime, time_twelve, time_eight_thirty, time_ten_thirty, time_thirteen_thirty, time_fitteen_thirty, time_eightten, time_dvalueS int64
-var finishdate, date string
-var err error
-var Holiday []map[string]interface{}
-
-//初始数据
-func init() {
-	timeNow = time.Now().Unix() //当前时间戳
-	time_two = 7200
-	date = time.Unix(timeNow, 0).Format("2006-01-02")
-	the_time, err := time.ParseInLocation("2006-01-02", date, time.Local)
-	if err == nil {
-		unix_time = the_time.Unix()
-	}
-	time_eight_thirty = unix_time + 30600    //当前日期08:30的时间戳
-	time_ten_thirty = unix_time + 37800      //当前日期10:30的时间戳
-	time_twelve = unix_time + 43200          //当前日期12:00的时间戳
-	time_thirteen_thirty = unix_time + 48600 //当前日期13:30的时间戳
-	time_fitteen_thirty = unix_time + 55800  //当前日期15:30点的时间戳
-	time_eightten = unix_time + 64800        //当前日期18:00点的时间戳
-}
-
-func LastTime(timeHour int) int64 {
-	//func main() {
-	var days int
-	//传入时间
-	//timeHour := 120
-	//传入当前时间戳
-	time_now := time.Now().Unix()
-	if time_now <= time_eight_thirty {
-		time_now = time_eight_thirty
-	} else if time_now > time_twelve && time_now <= time_thirteen_thirty {
-		time_now = time_thirteen_thirty
-	}
-	if timeHour == 2 {
-		//传来2并且时间戳在12点之前 上午导入
-		if time_now <= time_twelve && time_now >= time_eight_thirty {
-			time_dvalueS = time_twelve - time_now - time_two
-			ret = twoBeforeTwelve(time_dvalueS)
-		} else if time_now >= time_thirteen_thirty && time_now < time_eightten {
-			//传来2并且时间戳在13:30点之后 下午导入
-			time_dvalueS = time_eightten - time_now - time_two
-			ret = twoAfterTwelve(time_dvalueS)
-		} else if time_now >= time_eightten {
-			//18:00之后导入
-			finishtime = time_ten_thirty + 86400
-			ret = getDay(finishtime)
-			//ret = ioExcel(finishtime)
-		}
-	} else if timeHour == 6 {
-		//传来6并且时间戳在10:30点之前 上午导入 当天可完成
-		if time_now >= time_eight_thirty && time_now <= time_ten_thirty {
-			finishtime = time_eightten - time_ten_thirty + time_now
-			//ret = sixBeforeTenthirty(finishtime)
-			ret = finishtime
-		} else if time_now > time_eight_thirty && time_now <= time_twelve {
-			//传来6并且时间戳在10:30-12:00点 上午导入,第二天完成,验证是否是法定节假日
-			time_dvalueS = time_twelve - time_now
-			ret = sixAfterTenthirty(time_dvalueS)
-		} else if time_now >= time_thirteen_thirty && time_now <= time_fitteen_thirty {
-			//传来6并且时间戳在13:30-15:30点 下午导入,第二天上午完成,验证是否是法定节假日
-			time_dvalueS = time_fitteen_thirty - time_now
-			ret = sixBeforeFitteenthirty(time_dvalueS)
-		} else if time_now > time_thirteen_thirty && time_now <= time_eightten {
-			//传来6并且时间戳在15:30-18:00点 下午导入,第二天下午完成,验证是否是法定节假日
-			time_dvalueS = time_now - time_fitteen_thirty
-			ret = sixAfterFitteenthirty(time_dvalueS)
-		}
-	} else if timeHour == 48 { //2天
-		days = 2
-		ret = getDays(days)
-	} else if timeHour == 120 { //5天
-		days = 5
-		ret = getDays(days)
-	}
-	return ret
-}
-
-//2小时上午开始
-func twoBeforeTwelve(time_dvalue int64) int64 {
-	//10点前导入,上午下班前即可完成
-	if time_dvalue > 0 {
-		finishtime = time_twelve - time_dvalue
-		//finishdate = time.Unix(finishtime, 0).Format("2006-01-02 15:04:05")
-	} else {
-		//10-12点之间导入,下午下班前即可完成
-		finishtime = time_thirteen_thirty - time_dvalue
-		//finishdate = time.Unix(finishtime, 0).Format("2006-01-02 15:04:05")
-	}
-	return finishtime
-}
-
-//2小时下午开始
-func twoAfterTwelve(time_dvalue int64) int64 {
-	//16点前导入,下午下班前即可完成
-	if time_dvalue > 0 {
-		finishtime = time_eightten - time_dvalue
-		finishdate = time.Unix(finishtime, 0).Format("2006-01-02 15:04:05")
-	} else {
-		//16-18点之间导入,第二天上午即可完成,验证是否是法定节假日
-		finishtime = time_eight_thirty + 86400 - time_dvalue
-		//验证是否是节假日
-		finishtime = getDay(finishtime)
-		//finishtime = ioExcel(finishtime)
-	}
-	return finishtime
-}
-
-func getDay(finishtime int64) int64 {
-	//finishtime为第二天应该完成的准确时间
-	now := time.Now().UTC()
-	addtime := now.AddDate(0, 0, 1)
-	var index int64 = 0
-	for _, v := range Holiday {
-		start, _ := time.Parse("2006-01-02", v["start"].(string))
-		end, _ := time.Parse("2006-01-02", v["end"].(string))
-		if (now.Before(start) && (addtime.After(end) || addtime.Equal(end))) || ((addtime.After(start) || addtime.Equal(start)) && (addtime.Before(end) || addtime.Equal(end))) {
-			addtime = addtime.AddDate(0, 0, util.IntAll(v["count"]))
-			//timeUnix = addtime.Unix()
-			index = index + util.Int64All(v["count"])
-		}
-	}
-	finishtime = finishtime + index*86400
-	return finishtime
-}
-
-//6小时 10:30-12:00导入
-func sixAfterTenthirty(time_dvalue int64) int64 {
-	finishtime = time_eight_thirty + 86400 + 5400 - time_dvalue
-	finishtime = getDay(finishtime)
-	//finishtime = ioExcel(finishtime)
-	return finishtime
-}
-
-//6小时 13:30-15:30导入
-func sixBeforeFitteenthirty(time_dvalue int64) int64 {
-	finishtime = time_twelve + 86400 - time_dvalue
-	finishtime = getDay(finishtime)
-	//finishtime = ioExcel(finishtime)
-	return finishtime
-}
-
-//6小时 15:30-18:00导入
-func sixAfterFitteenthirty(time_dvalue int64) int64 {
-	finishtime = time_thirteen_thirty + 86400 + time_dvalue
-	finishtime = getDay(finishtime)
-	//finishtime = ioExcel(finishtime)
-	return finishtime
-}
-
-func getDays(days int) int64 {
-	var timeUnix int64
-	now := time.Now()
-	addtime := now.AddDate(0, 0, days)
-	for _, v := range Holiday {
-		start, _ := time.Parse("2006-01-02", v["start"].(string))
-		end, _ := time.Parse("2006-01-02", v["end"].(string))
-		if (now.Before(start) && (addtime.After(end) || addtime.Equal(end))) || ((addtime.After(start) || addtime.Equal(start)) && (addtime.Before(end) || addtime.Equal(end))) {
-			addtime = addtime.AddDate(0, 0, util.IntAll(v["count"]))
-			timeUnix = addtime.Unix()
-		} else {
-			timeUnix = addtime.Unix()
-		}
-	}
-	return timeUnix
-}
-
-//验证法定节假日
-func ioExcel(finishtime int64) int64 {
-	finishdate = time.Unix(finishtime, 0).Format("2006-01-02")
-	var index int64 = 0
-	var finishtimed int64
-	ex, err := xlsx.OpenFile("dayOff.xlsx")
-	if err == nil {
-		sheet := ex.Sheets[0]
-		rows := sheet.Rows
-		for _, v := range rows {
-			cols := v.Cells[0].Value
-			if cols == finishdate {
-				index = index + 1
-				finishtimed = finishtime + 86400*index
-				finishdate = time.Unix(finishtimed, 0).Format("2006-01-02")
-			}
-		}
-	}
-	finishtime = finishtime + index*86400
-	//finishdate = time.Unix(finishtime, 0).Format("2006-01-02 15:04:05")
-	return finishtime
-}

+ 0 - 104
finishtime/finsh.go

@@ -1,104 +0,0 @@
-// finish
-package finishtime
-
-import (
-	qu "qfw/util"
-	"strings"
-	"time"
-)
-
-var workfig map[string]map[string]string
-var morning_on, morning_off, afternoon_on, afternoon_off string
-
-func init() {
-	qu.ReadConfig("./worktime.json", &workfig)
-	morning_on = workfig["morning"]["on"]
-	morning_off = workfig["morning"]["off"]
-	afternoon_on = workfig["afternoon"]["on"]
-	afternoon_off = workfig["afternoon"]["off"]
-}
-
-//获取完成时间
-func CompleteTime(urgent string) int64 {
-	duration := workfig["urgency"][urgent]
-	do := int64(0)
-	if strings.Contains(duration, "h") { //单位为小时,需要计算
-		do = qu.Int64All(strings.Replace(duration, "h", "", -1)) * int64(3600)
-	} else {
-		return 0
-	}
-	endtime := time.Now()
-	for i := 0; i < 100; i++ { //轮询调度直到,剩余工时为零
-		if do > 0 {
-			do, endtime = getWorkTime(do, endtime)
-		} else {
-			break
-		}
-	}
-	return endtime.Unix()
-}
-
-/*计算剩余工时,和完成时间
-do:工时
-t:时间
-spare:剩余工时
-endtime:完成时间
-*/
-func getWorkTime(do int64, t time.Time) (spare int64, endtime time.Time) {
-	mon, _ := time.ParseInLocation(qu.Date_Full_Layout, t.Format(qu.Date_Short_Layout)+" "+morning_on+":00", time.Local)
-	moff, _ := time.ParseInLocation(qu.Date_Full_Layout, t.Format(qu.Date_Short_Layout)+" "+morning_off+":00", time.Local)
-	aon, _ := time.ParseInLocation(qu.Date_Full_Layout, t.Format(qu.Date_Short_Layout)+" "+afternoon_on+":00", time.Local)
-	aoff, _ := time.ParseInLocation(qu.Date_Full_Layout, t.Format(qu.Date_Short_Layout)+" "+afternoon_off+":00", time.Local)
-	if t.Unix() <= mon.Unix() {
-		//早上上班前
-		work := moff.Unix() - mon.Unix()
-		if work >= do {
-			spare = 0
-			endtime = mon.Add(time.Duration(do) * time.Second)
-		} else {
-			spare = do - work
-			endtime = moff
-		}
-	} else if t.Unix() >= mon.Unix() && t.Unix() < moff.Unix() {
-		//中午下班前
-		work := moff.Unix() - t.Unix()
-		if work >= do {
-			spare = 0
-			endtime = t.Add(time.Duration(do) * time.Second)
-		} else {
-			spare = do - work
-			endtime = moff
-		}
-	} else if t.Unix() >= moff.Unix() && t.Unix() < aon.Unix() {
-		//下午上班前
-		work := aoff.Unix() - aon.Unix()
-		if work >= do {
-			spare = 0
-			endtime = aon.Add(time.Duration(do) * time.Second)
-		} else {
-			spare = do - work
-			endtime = aoff
-		}
-	} else if t.Unix() >= aon.Unix() && t.Unix() <= aoff.Unix() {
-		//下午下班前
-		work := aoff.Unix() - t.Unix()
-		if work >= do {
-			spare = 0
-			endtime = t.Add(time.Duration(do) * time.Second)
-		} else {
-			spare = do - work
-			endtime = mon.AddDate(0, 0, 1)
-		}
-	} else {
-		//下午下班
-		endtime = mon.AddDate(0, 0, 1)
-	}
-
-	//判断星期天
-	if endtime.Weekday().String() == "Sunday" {
-		endtime = endtime.AddDate(0, 0, 1)
-	} else if endtime.Weekday().String() == "Saturday" {
-		endtime = endtime.AddDate(0, 0, 2)
-	}
-	return spare, endtime
-}

+ 0 - 934
front/front.go

@@ -1,934 +0,0 @@
-// front
-package front
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"luaweb/spider"
-	u "luaweb/util"
-	qu "qfw/util"
-	mgdb "qfw/util/mongodb"
-	"qfw/util/redis"
-	"regexp"
-	"sort"
-	util "spiderutil"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/go-xweb/httpsession"
-	"github.com/go-xweb/xweb"
-	"github.com/lauyoume/gopinyin"
-	"github.com/tealeg/xlsx"
-	"gopkg.in/mgo.v2/bson"
-)
-
-type Front struct {
-	*xweb.Action
-	login              xweb.Mapper `xweb:"/"`
-	logout             xweb.Mapper `xweb:"/center/logout"`                    //退出
-	loadIndex          xweb.Mapper `xweb:"/center"`                           //控制中心
-	spidernew          xweb.Mapper `xweb:"/center/spider"`                    //爬虫保存
-	reg                xweb.Mapper `xweb:"/center/reg"`                       //爬虫注册
-	assign             xweb.Mapper `xweb:"/center/user/assign"`               //分配爬虫
-	loadSpider         xweb.Mapper `xweb:"/center/spider/edit/(.*)"`          //爬虫加载
-	viewSpider         xweb.Mapper `xweb:"/center/spider/view/(.*)"`          //爬虫查看
-	downSpider         xweb.Mapper `xweb:"/center/spider/download/(.*)"`      //爬虫下载
-	upState            xweb.Mapper `xweb:"/center/spider/upstate"`            //爬虫状态更新
-	assort             xweb.Mapper `xweb:"/center/spider/assort"`             //审核人员分类
-	batchShelves       xweb.Mapper `xweb:"/center/spider/batchShelves"`       //爬虫状态更新
-	checktime          xweb.Mapper `xweb:"/center/spider/checktime"`          //爬虫核对
-	disables           xweb.Mapper `xweb:"/center/spider/disable"`            //批量作废
-	changeEvent        xweb.Mapper `xweb:"/center/changeEvent"`               //节点更新
-	getJson            xweb.Mapper `xweb:"/center/spider/json"`               //
-	delRedis           xweb.Mapper `xweb:"/center/spider/delRedis"`           //清理Redis
-	updateEventOrState xweb.Mapper `xweb:"/center/spider/updateeventorstate"` //修改爬虫的节点和状态
-
-	spiderModel xweb.Mapper `xweb:"/center/model"`           //获取补充模型
-	runStep     xweb.Mapper `xweb:"/center/run"`             //方法测试
-	spiderPass  xweb.Mapper `xweb:"/center/spider/pass"`     //整体测试
-	runPinYin   xweb.Mapper `xweb:"/center/runpy"`           //获取拼音
-	saveStep    xweb.Mapper `xweb:"/center/save"`            //保存脚本
-	loadModel   xweb.Mapper `xweb:"/center/gmodel/(.*)"`     //加载模型
-	importdata  xweb.Mapper `xweb:"/center/importdata"`      //导入脚本
-	importfile  xweb.Mapper `xweb:"/center/importfile"`      //批量导入爬虫
-	oldedit     xweb.Mapper `xweb:"/center/oldedit"`         //老文件编辑
-	findName    xweb.Mapper `xweb:"/center/findname"`        //即时查询名称
-	checkrepeat xweb.Mapper `xweb:"/center/spider/isrepeat"` //脚本代码判重
-	Base        Base
-	OtherBase   OtherBase
-	Step1       Step1
-	Step2       Step2
-	Step3       Step3
-	U           U
-
-	luaList       xweb.Mapper `xweb:"/center/lualist.html"`       //脚本管理
-	user          xweb.Mapper `xweb:"/center/user.html"`          //用户管理
-	delUser       xweb.Mapper `xweb:"/center/user/del"`           //删除用户
-	updateUser    xweb.Mapper `xweb:"/center/user/updateUser"`    //修改用户信息
-	checkUsenamer xweb.Mapper `xweb:"/center/user/checkUsenamer"` //校验用户名的唯一性
-	checkEmail    xweb.Mapper `xweb:"/center/user/checkEmail"`    //校验邮箱的唯一性
-	saveNewUser   xweb.Mapper `xweb:"/center/user/saveNewUser"`   //添加用户
-
-	getCity xweb.Mapper `xweb:"/center/getCity"` //获取城市
-}
-
-const role_admin, role_examine, role_dev = 3, 2, 1                                                                            //管理员,审核员,开发员
-const Sp_state_0, Sp_state_1, Sp_state_2, Sp_state_3, Sp_state_4, Sp_state_5, Sp_state_6, Sp_state_7 = 0, 1, 2, 3, 4, 5, 6, 7 //0待完成,1待审核,2打回,3发布,4作废,5已上架,6已下架,7其他
-
-var spinfos sync.Map = sync.Map{}
-var SessMap map[string]*httpsession.Session
-var AutoTpl map[string]interface{}
-var Mails *util.Mail
-var Reg = regexp.MustCompile(`(http|https)://([\w]+\.)+[\w]+`)
-var Transfercode map[string]interface{}
-var LuaStateMap = map[int]string{
-	0:  "待完成",
-	1:  "待审核",
-	2:  "未通过",
-	3:  "已通过",
-	4:  "已作废",
-	5:  "已上架",
-	6:  "已下架",
-	7:  "无发布",
-	8:  "需登录",
-	9:  "无法处理",
-	10: "已删除",
-}
-
-func (f *Front) Login() error {
-	username := f.GetString("username")
-	password := f.GetString("password")
-	f.SetSession("password", password)
-	password = util.Se.EncodeString(password)
-	query := bson.M{
-		"s_name": username,
-		"s_pass": password,
-	}
-	user := *mgdb.FindOne("user", query)
-	if user != nil && user["i_delete"] == 0 {
-		f.SetSession("userid", user["_id"].(bson.ObjectId).Hex())
-		f.SetSession("username", user["s_fullname"])
-		f.SetSession("loginuser", user["s_name"])
-		f.SetSession("email", user["s_email"])
-		f.SetSession("auth", user["i_auth"])
-		comeintime := time.Unix(user["l_comeintime"].(int64), 0).Format("2006-01-02")
-		f.SetSession("comeintime", comeintime)
-		if qu.IntAll(user["i_auth"]) > role_admin {
-			return f.Redirect("/center/user.html")
-		} else if qu.IntAll(user["i_auth"]) == role_dev {
-			return f.Redirect("/center/mytask")
-		} else {
-			return f.Redirect("/center")
-		}
-	} else {
-		if username != "" {
-			f.T["fail"] = "fail"
-		}
-		return f.Render("login.html", &f.T)
-	}
-}
-
-//用户管理
-func (f *Front) User() {
-	if f.Method() == "POST" {
-		auth := qu.IntAll(f.GetSession("auth"))
-		if auth > role_admin {
-			start, _ := f.GetInteger("start")
-			limit, _ := f.GetInteger("length")
-			draw, _ := f.GetInteger("draw")
-			query := bson.M{
-				"i_delete": 0, //可用用户
-				"i_auth": bson.M{
-					"$lt": auth,
-				},
-			}
-			user := *mgdb.Find("user", query, nil, nil, false, start, limit)
-			count := mgdb.Count("user", query)
-			page := start / 10
-			for k, v := range user {
-				v["num"] = k + 1 + page*10
-
-				v["l_comeintime"] = time.Unix(v["l_comeintime"].(int64), 0).Format("2006-01-02")
-				v["s_pass"] = util.Se.DecodeString(v["s_pass"].(string))
-				v["userid"] = v["_id"].(bson.ObjectId).Hex()
-			}
-			f.ServeJson(map[string]interface{}{
-				"draw":            draw,
-				"data":            user,
-				"recordsFiltered": count,
-				"recordsTotal":    count,
-			})
-		}
-	} else {
-		f.Render("user.html")
-	}
-
-}
-
-//删除用户
-func (f *Front) DelUser() {
-	userid := f.GetString("userid")
-	auth := qu.IntAll(f.GetSession("auth"))
-	if auth > role_admin {
-		query := bson.M{
-			"_id": bson.ObjectIdHex(userid),
-		}
-
-		update := bson.M{
-			"$set": bson.M{
-				"i_delete": 1,
-			},
-		}
-		ok := mgdb.Update("user", query, update, false, false)
-		if ok {
-			f.ServeJson(map[string]interface{}{
-				"status": "y",
-			})
-		} else {
-			f.ServeJson(map[string]interface{}{
-				"status": "n",
-			})
-		}
-	} else {
-		f.ServeJson(map[string]interface{}{
-			"status": "e",
-		})
-	}
-}
-
-//修改用户
-func (f *Front) UpdateUser() {
-	//	username := f.GetString("username")
-	password := f.GetString("password")
-	userid := f.GetString("userid")
-	f.SetSession("password", password)
-	userAuth := f.GetString("userAuth")
-	auth := qu.IntAll(f.GetSession("auth"))
-	self := f.GetString("self")
-	//log.Println("userid----:", userid, "username----:", username, "password----:", password, "auth----:", auth, "self----:", self)
-	query := bson.M{
-		"_id": bson.ObjectIdHex(userid),
-	}
-	update := bson.M{}
-	if "y" == self { //修改个人信息 只修改个人密码
-		password = util.Se.EncodeString(password)
-		update = bson.M{
-			"$set": bson.M{
-				"s_pass": password,
-			},
-		}
-	} else if "y" != self && auth == 4 { //修改他人信息 只修改他人权限
-		if userAuth == "开发员" || userAuth == "审核员" || userAuth == "管理员" {
-			switch userAuth {
-			case "开发员":
-				update = bson.M{
-					"$set": bson.M{
-						"i_auth": 1,
-					},
-				}
-			case "审核员":
-				update = bson.M{
-					"$set": bson.M{
-						"i_auth": 2,
-					},
-				}
-			case "管理员":
-				update = bson.M{
-					"$set": bson.M{
-						"i_auth": 3,
-					},
-				}
-			}
-		}
-	} else {
-		f.ServeJson("没有权限!")
-		return
-	}
-	ok := mgdb.Update("user", query, update, false, false)
-	if ok {
-		f.ServeJson(map[string]interface{}{
-			"status": "y",
-		})
-	} else {
-		f.ServeJson(map[string]interface{}{
-			"status": "n",
-		})
-	}
-}
-
-func (f *Front) CheckUsenamer() {
-	username := f.GetString("username")
-	if username != "" {
-		query := bson.M{
-			"s_name": username,
-		}
-		user := *mgdb.FindOne("user", query)
-		if user != nil {
-			f.ServeJson(map[string]interface{}{
-				"status": "hasUser",
-			})
-		} else {
-			f.ServeJson(map[string]interface{}{
-				"status": "notHasUser",
-			})
-		}
-	}
-
-}
-
-func (f *Front) CheckEmail() {
-	email := f.GetString("email")
-	//校验邮箱
-	if email != "" {
-		query := bson.M{
-			"s_email": email,
-		}
-		user := *mgdb.FindOne("user", query)
-		if user != nil {
-			f.ServeJson(map[string]interface{}{
-				"status": "hasEmail",
-			})
-		} else {
-			f.ServeJson(map[string]interface{}{
-				"status": "notHasEmail",
-			})
-		}
-	}
-}
-
-//新增用户
-func (f *Front) SaveNewUser() {
-	auth := qu.IntAll(f.GetSession("auth"))
-	if auth != 4 {
-		f.ServeJson("没有权限!")
-		return
-	} else {
-		i_auth := 1
-		username := f.GetString("username")
-		password := f.GetString("password")
-		relname := f.GetString("relname")
-		password = util.Se.EncodeString(password)
-		email := f.GetString("email")
-		userAuth := f.GetString("userAuth")
-		if userAuth == "开发员" {
-			i_auth = 1
-		} else if userAuth == "审核员" {
-			i_auth = 2
-		} else {
-			i_auth = 3
-		}
-		time := time.Now().Unix()
-		save := bson.M{
-			"s_name":       username,
-			"s_fullname":   relname,
-			"s_email":      email,
-			"s_pass":       password,
-			"i_auth":       i_auth,
-			"i_delete":     0,
-			"l_comeintime": time,
-		}
-		ok := mgdb.Save("user", save)
-		if ok != "" {
-			f.ServeJson(map[string]interface{}{
-				"status": "y",
-			})
-		} else {
-			f.ServeJson(map[string]interface{}{
-				"status": "n",
-			})
-		}
-	}
-
-}
-
-func (f *Front) Logout() {
-	email := f.GetSession("email").(string)
-	f.DelSession("username")
-	f.DelSession("userid")
-	f.DelSession("email")
-	f.DelSession("user")
-	f.DelSession("loginuser")
-	f.DelSession("auth")
-	delete(SessMap, email)
-	f.Redirect("/center")
-}
-
-//控制中心
-func (f *Front) LoadIndex() {
-	auth := qu.IntAll(f.GetSession("auth"))
-	if f.Method() == "POST" {
-		start, _ := f.GetInteger("start")
-		limit, _ := f.GetInteger("length")
-		draw, _ := f.GetInteger("draw")
-		searchStr := f.GetString("search[value]")
-		event, _ := f.GetInteger("taskEvent") //节点
-		//searchN := strings.Replace(searchStr, " ", "", -1)
-		//search := strings.Replace(searchN, "\n", "", -1)
-		search := strings.TrimSpace(searchStr)
-		state, _ := f.GetInteger("state")
-		urgency, _ := f.GetInteger("urgency") //节点
-		query := bson.M{}
-		if event > -1 {
-			query["event"] = event
-		}
-		if urgency > -1 {
-			query["urgency"] = urgency
-		}
-		if auth == role_examine { //审核员
-			if state > -1 {
-				query["state"] = state
-			} else {
-				query["state"] = Sp_state_1
-			}
-			if search != "" {
-				query["$or"] = []interface{}{
-					bson.M{"code": bson.M{"$regex": search}},
-					bson.M{"createuser": bson.M{"$regex": search}},
-					bson.M{"param_common.1": bson.M{"$regex": search}},
-				}
-			}
-		} else if auth == role_dev { //开发员
-			if state > -1 {
-				query["state"] = state
-			}
-			query["createuserid"] = f.GetSession("userid")
-			query["$or"] = []interface{}{
-				bson.M{"code": bson.M{"$regex": search}},
-				bson.M{"createuser": bson.M{"$regex": search}},
-				bson.M{"param_common.1": bson.M{"$regex": search}},
-			}
-		} else { //管理员
-			if state > -1 {
-				query["state"] = state
-			}
-			query["$or"] = []interface{}{
-				bson.M{"code": bson.M{"$regex": search}},
-				bson.M{"createuser": bson.M{"$regex": search}},
-				bson.M{"param_common.1": bson.M{"$regex": search}},
-			}
-		}
-		sort := `{"%s":%d}`
-		orderIndex := f.GetString("order[0][column]")
-		orderName := f.GetString(fmt.Sprintf("columns[%s][data]", orderIndex))
-		orderType := 1
-		if f.GetString("order[0][dir]") != "asc" {
-			orderType = -1
-		}
-		if orderName == "param_common" {
-			orderName = orderName + ".1"
-		}
-		sort = fmt.Sprintf(sort, orderName, orderType)
-		page := start / 10
-		//log.Println("sort", sort, orderName)
-		luas := *mgdb.Find("luaconfig", query, sort, list_fields, false, start, limit)
-		count := mgdb.Count("luaconfig", query)
-		for k, v := range luas {
-			v["num"] = k + 1 + page*10
-			if v["modifytime"] != nil {
-				v["modifytime"] = time.Unix(v["modifytime"].(int64), 0).Format("2006-01-02 15:04:05")
-			} else {
-				v["modifytime"] = "-"
-			}
-			if v["modifyuser"] == nil {
-				v["modifytime"] = "-"
-			}
-			v["encode"] = util.Se.Encode2Hex(fmt.Sprint(v["code"]))
-			if v["event"] == nil { //节点
-				v["event"] = 0
-			}
-			//v["state"] = LuaStateMap[qu.IntAll(v["state"])]
-		}
-		f.ServeJson(map[string]interface{}{"draw": draw, "data": luas, "recordsFiltered": count, "recordsTotal": count})
-	} else {
-		events := []string{}
-		for k, _ := range util.Config.Uploadevents {
-			events = append(events, k)
-		}
-		sort.Strings(events)
-		f.T["events"] = events
-		f.Render("index.html", &f.T)
-	}
-}
-
-func (f *Front) Checkrepeat() {
-	code := f.GetString("code")
-	one := *mgdb.FindOne("luaconfig", bson.M{"code": code})
-	if len(one) > 0 {
-		f.ServeJson("y")
-	} else {
-		f.ServeJson("n")
-	}
-
-}
-
-//新建
-func (f *Front) Spidernew() error {
-	auth := qu.IntAll(f.GetSession("auth"))
-	if auth != role_admin {
-		return nil
-	}
-	copy := f.GetString("copy")
-	if copy != "" {
-		one := *mgdb.FindOne("luaconfig", bson.M{"code": copy})
-		delete(one, "_id")
-		delete(one, "code")
-		base := one["param_common"].([]interface{})
-		base[0] = ""
-		base[1] = ""
-		one["param_common"] = base
-		f.T["lua"] = one
-	}
-	f.T["isflow"] = 1 //新建爬虫时,初始化isflow的值
-	f.T["actiontext"] = "新建"
-	f.T["restate"] = 4 //此处设置restate=4无意义,只为了页面不报错
-	return f.Render("spideredit.html", &f.T)
-}
-
-//得到模型
-func (f *Front) SpiderModel() {
-	f.ServeJson(util.Config.Model)
-}
-
-func (f *Front) RunPinYin() {
-	word := f.GetString("word")
-	str := gopinyin.Convert(word, true)
-	f.Write(str)
-}
-
-type U struct {
-	User string
-	Name string
-	Pwd  string
-}
-
-func (f *Front) Reg() {
-
-}
-func (f *Front) Assort() {
-	state, _ := f.GetInteger("state")
-	code := f.GetString("code")
-	sql := bson.M{
-		"$set": bson.M{
-			"state":      state,
-			"modifytime": time.Now().Unix(),
-		},
-	}
-	queryT := bson.M{
-		"code": code,
-	}
-	//下架爬虫
-	lua := *mgdb.FindOne("luaconfig", queryT)
-	upresult, err := spider.UpdateSpiderByCodeState(code, "6", qu.IntAll(lua["event"]))
-	qu.Debug("下架爬虫:", code, upresult, err)
-	if upresult && err == nil {
-		//更新爬虫
-		mgdb.Update("luaconfig", queryT, sql, false, false)
-		//关闭任务
-		query := bson.M{
-			"s_code": code,
-		}
-		s := *mgdb.Find("task", query, nil, nil, false, -1, -1)
-		if s != nil {
-			var idArr []string
-			for _, v := range s {
-				idArr = append(idArr, v["_id"].(bson.ObjectId).Hex())
-			}
-			for _, id := range idArr {
-				sql = bson.M{
-					"$set": bson.M{
-						"i_state": 6,
-					},
-				}
-				mgdb.Update("task", bson.M{"_id": bson.ObjectIdHex(id)}, sql, false, false)
-			}
-		}
-	}
-	f.ServeJson(bson.M{"upresult": upresult})
-}
-
-func (f *Front) Importfile() {
-	auth := qu.IntAll(f.GetSession("auth"))
-	if auth != role_admin {
-		f.ServeJson("没有权限")
-		return
-	}
-	if f.Method() == "POST" {
-		mf, _, err := f.GetFile("xlsx")
-		errorinfo := map[string]interface{}{}
-		if err == nil {
-			binary, _ := ioutil.ReadAll(mf)
-			xls, _ := xlsx.OpenBinary(binary)
-			sheet := xls.Sheets[0]
-			rows := sheet.Rows
-			for k, v := range rows {
-				if k != 0 {
-					cells := v.Cells
-					if cells[1].Value != "" {
-						o := make(map[string]interface{})
-						o["name"] = cells[0].Value
-						o["code"] = cells[1].Value
-						o["channel"] = cells[2].Value
-						o["channeladdr"] = cells[3].Value
-						o["author"] = cells[4].Value
-						o["timestamp"] = time.Now().Unix()
-						o["status"] = 1
-						o["next"] = cells[4].Value
-						o["event"] = cells[5].Value
-						o["historyevent"] = cells[6].Value
-						if cells[7].Value == "是" {
-							o["isflow"] = 1
-						} else {
-							o["isflow"] = 0
-						}
-						if cells[8].Value == "紧急" {
-							o["urgency"] = 1
-						} else {
-							o["urgency"] = 0
-						}
-						//						table := cells[6].Value
-						//						o["table"] = table
-						//						o["transfercode"] = qu.IntAll(Transfercode[table])
-						query := bson.M{"code": cells[1].Value}
-						rs := *mgdb.FindOne("import", query)
-						if len(rs) > 0 {
-							errorinfo[cells[1].Value] = "第" + strconv.Itoa(k) + "行重复,已经过滤"
-						} else {
-							ok, name := pf(o) //保存爬虫
-							if ok == false {
-								errorinfo[cells[1].Value] = "第" + strconv.Itoa(k) + "行找不到作者,已经过滤"
-							} else {
-								o["author"] = name
-								mgdb.Save("import", o)
-							}
-						}
-					}
-				}
-			}
-			f.ServeJson(errorinfo)
-		} else {
-			f.ServeJson(false)
-		}
-	}
-}
-
-func pf(o map[string]interface{}) (bool, string) {
-	AutoTpl["Base.SpiderName"] = o["name"]
-	AutoTpl["Base.SpiderCode"] = o["code"]
-	AutoTpl["Base.SpiderChannel"] = o["channel"]
-	AutoTpl["Base.SpiderTargetChannelUrl"] = o["channeladdr"]
-	author := o["author"].(string)
-	one := *mgdb.FindOne("user", bson.M{"s_email": author})
-	id := one["_id"].(bson.ObjectId).Hex()
-	if len(one) == 0 {
-		return false, ""
-	}
-	common := []interface{}{
-		AutoTpl["Base.SpiderCode"],
-		AutoTpl["Base.SpiderName"],
-		AutoTpl["Base.SpiderChannel"],
-		AutoTpl["Base.SpiderDownDetailPage"],
-		AutoTpl["Base.SpiderStartPage"],
-		AutoTpl["Base.SpiderMaxPage"],
-		AutoTpl["Base.SpiderRunRate"],
-		//AutoTpl["Base.Spider2Collection"],
-		"bidding", //爬虫导入新建默认为bidding
-		AutoTpl["Base.SpiderPageEncoding"],
-		AutoTpl["Base.SpiderStoreMode"],
-		AutoTpl["Base.SpiderStoreToMsgEvent"],
-		AutoTpl["Base.SpiderTargetChannelUrl"],
-		AutoTpl["Base.SpiderLastDownloadTime"],
-		AutoTpl["Base.SpiderIsHistoricalMend"],
-		AutoTpl["Base.SpiderIsMustDownload"],
-	}
-	ptime := []interface{}{
-		AutoTpl["Step1.DateFormat"],
-		AutoTpl["Step1.Address"],
-		AutoTpl["Step1.ContentChooser"],
-	}
-	list := []interface{}{
-		AutoTpl["Step2.Listadd"],
-		AutoTpl["Step2.Listadds"],
-		AutoTpl["Step2.BlockChooser"],
-		AutoTpl["Step2.AddressChooser"],
-		AutoTpl["Step2.TitleChooser"],
-		AutoTpl["Step2.DateChooser"],
-		AutoTpl["Step2.DateFormat"],
-	}
-	content := []interface{}{
-		AutoTpl["Step3.ContentChooser"],
-		AutoTpl["Step3.ElementChooser"],
-	}
-	param := map[string]interface{}{}
-	param["param_common"] = common
-	param["param_common"] = common
-	//向导模式
-	param["param_time"] = ptime
-	param["param_list"] = list
-	param["param_content"] = content
-	param["type_time"] = 0
-	param["type_list"] = 0
-	param["type_content"] = 0
-	//专家模式
-	param["str_time"] = ""
-	param["str_list"] = ""
-	param["str_content"] = ""
-	param["comeintime"] = time.Now().Unix()
-	param["code"] = o["code"]
-	param["createuser"] = one["s_name"]
-	param["createuserid"] = id
-	param["createuseremail"] = one["s_email"]
-	param["modifyuser"] = one["s_name"]
-	param["modifyuserid"] = id
-	param["modifytime"] = time.Now().Unix()
-	param["state"] = 0 //未完成
-	if qu.IntAll(o["event"]) > 0 {
-		param["event"] = qu.IntAll(o["event"])
-	}
-	s_model := "bid"
-	configModel := util.Config.Model[s_model]
-	model := map[string]interface{}{}
-	for k, _ := range configModel {
-		model[k] = ""
-	}
-	param["model"] = model
-	param["next"] = o["next"]
-	param["urgency"] = o["urgency"]
-	param["isflow"] = o["isflow"]
-	param["spidertype"] = "history"
-	historyevent := qu.ObjToString(o["historyevent"])
-	if movevent, ok := util.Config.Uploadevents[historyevent].(string); ok && movevent != "" {
-		param["spidermovevent"] = movevent
-	} else {
-		param["spidermovevent"] = "7700"
-	}
-	param["historyevent"] = qu.IntAll(o["historyevent"])
-	param["spiderhistorymaxpage"] = 1
-	//qu.Debug("param---", param)
-	issave := spider.SaveSpider(o["code"].(string), param)
-	return issave, one["s_name"].(string)
-}
-
-func (f *Front) Importdata() {
-	auth := qu.IntAll(f.GetSession("auth"))
-	if auth == role_admin {
-		if f.Method() == "GET" {
-			f.Render("import.html")
-		} else {
-			rss := *mgdb.Find("import", nil, `{"timestamp": -1}`, nil, false, -1, -1)
-			f.ServeJson(map[string]interface{}{
-				"data": rss,
-			})
-		}
-	} else {
-		f.Write("您没有导入脚本的权限")
-	}
-}
-
-func Wlog(name, code, man, manid, types string, content map[string]interface{}) {
-	obj := bson.M{
-		"name":    name,
-		"code":    code,
-		"man":     man,
-		"manid":   manid,
-		"types":   types,
-		"time":    time.Now().Unix(),
-		"content": content,
-	}
-	mgdb.Save("lua_logs", obj)
-}
-
-func (f *Front) Oldedit() {
-	if f.Method() == "GET" {
-		f.Render("oldedit.html")
-	} else {
-
-	}
-}
-
-func (f *Front) FindName() {
-	words := f.GetString("words")
-	if words == "" {
-		f.ServeJson(bson.M{"error": "null"})
-	}
-	query := bson.M{"$or": []interface{}{
-		bson.M{"param_common.0": bson.M{"$regex": words}},
-		bson.M{"param_common.1": bson.M{"$regex": words}},
-		bson.M{"createuser": bson.M{"$regex": words}},
-	}, "oldlua": bson.M{"$exists": false}}
-	rs := *mgdb.Find("luaconfig", query, bson.M{"modifytime": -1}, bson.M{"param_common": 1}, false, -1, -1)
-	if len(rs) > 0 {
-		f.ServeJson(bson.M{"data": rs})
-	} else {
-		f.ServeJson(bson.M{"error": "data"})
-	}
-}
-
-//分配爬虫
-func (f *Front) Assign() {
-	auth := qu.IntAll(f.GetSession("auth"))
-	if auth != role_admin {
-		f.Write("n")
-		return
-	}
-	ids := f.GetString("ids")
-	codes := f.GetString("codes")
-	email := f.GetString("email")
-	idarr := strings.Split(ids, ",")
-	codesarr := strings.Split(codes, ",")
-	var idsinter []interface{}
-	isemail := strings.Index(ids, "@")
-	user := *mgdb.FindOne("user", bson.M{"s_email": email})
-	if len(user) > 0 {
-		userid := user["_id"].(bson.ObjectId).Hex()
-		name := user["s_name"].(string)
-		var query bson.M
-		if isemail > -1 {
-			query = bson.M{
-				"createuseremail": bson.M{
-					"$in": idarr,
-				},
-			}
-		} else {
-			idsinter = make([]interface{}, len(idarr))
-			for k, v := range idarr {
-				idsinter[k] = bson.ObjectIdHex(v)
-			}
-			query = bson.M{
-				"_id": bson.M{
-					"$in": idsinter,
-				},
-			}
-		}
-
-		set := bson.M{
-			"$set": bson.M{
-				"createuserid":    userid,
-				"createuser":      user["s_name"],
-				"createuseremail": user["s_email"],
-				"modifyuser":      user["s_name"],
-				"modifyuserid":    userid,
-			},
-		}
-		b := mgdb.Update("luaconfig", query, set, false, true)
-		if b {
-			f.Write("y")
-			editModify(codesarr, userid, name) //分配
-		} else {
-			f.Write("n")
-		}
-	} else {
-		f.Write("null")
-	}
-}
-
-//修改维护人
-func editModify(codesarr []string, userid, name string) {
-	//修改modifyid和modify
-	for _, v := range codesarr {
-		query := bson.M{
-			"s_code": v,
-			"i_state": bson.M{
-				"$ne": 4,
-			},
-		}
-		task := *mgdb.Find("task", query, nil, nil, false, -1, -1)
-		if len(task) > 0 {
-			for _, v := range task { //循环 修改任务
-				update := bson.M{
-					"$set": bson.M{
-						"s_modify":   name,
-						"s_modifyid": userid,
-					},
-				}
-				queryT := bson.M{
-					"_id": v["_id"],
-				}
-				flag := mgdb.Update("task", queryT, update, false, false)
-				log.Println("分配修改任务维护人:", flag)
-			}
-		} else {
-			continue
-		}
-	}
-}
-
-//清理Redis
-func (f *Front) DelRedis() {
-	hrefs := f.GetString("href")
-	hrefsarr := strings.Split(hrefs, ",")
-	auth := qu.IntAll(f.GetSession("auth"))
-	err := []string{}
-	if auth == role_admin { //权限控制
-		if len(hrefsarr) > 0 {
-			for k1, h := range hrefsarr {
-				href := Reg.FindString(h)
-				if href != "" {
-					href = "url_repeat_" + href + "*"
-					res := redis.GetKeysByPattern("title_repeat_judgement", href)
-					if res != nil {
-						for _, v := range res {
-							hf := string(v.([]uint8))
-							b := redis.Del("title_repeat_judgement", hf)
-							if !b {
-								err = append(err, "第"+strconv.Itoa(k1+1)+"个")
-							}
-						}
-					}
-				} else {
-					err = append(err, "第"+strconv.Itoa(k1+1)+"个")
-				}
-			}
-		}
-	} else {
-		err = append(err, "没有权限")
-	}
-	f.ServeJson(err)
-}
-
-func (f *Front) UpdateEventOrState() {
-	val := f.GetString("val")
-	w := f.GetString("w")
-	id := f.GetString("id")
-	query := map[string]interface{}{
-		"_id": qu.StringTOBsonId(id),
-	}
-	set := map[string]interface{}{}
-	update := map[string]interface{}{
-		"$set": set,
-	}
-	if w == "state" { //修改状态为待完成
-		set["state"] = 0
-	} else { //修改节点
-		event, _ := strconv.Atoi(val)
-		set["event"] = event
-		set["historyevent"] = event
-		//state := f.GetString("s")
-		//if state == "5" { //已上架状态改为下架
-		code := f.GetString("c")
-		set["state"] = 6
-		b, err := UpStateAndUpSpider(code, "", "", "", Sp_state_6) //线上爬虫下架
-		if !b || err != nil {
-			f.Write("n")
-			return
-		}
-		//}
-	}
-	if mgdb.Update("luaconfig", query, update, false, false) {
-		log.Println("Id:", id, "	Update", w, val, "Success")
-		f.Write("y")
-	} else {
-		log.Println("Id:", id, "	Update", w, val, "Failed")
-		f.Write("n")
-	}
-	f.Write("n")
-}
-
-func (f *Front) GetCity() {
-	area := f.GetString("area")
-	cityArr := []string{}
-	cityArr = u.Province[area]
-	f.ServeJson(cityArr)
-}

+ 0 - 358
front/luamove.go

@@ -1,358 +0,0 @@
-package front
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"luaweb/spider"
-	"net/http"
-	qu "qfw/util"
-	mgdb "qfw/util/mongodb"
-	"sort"
-	util "spiderutil"
-	"strings"
-	"time"
-
-	"github.com/go-xweb/xweb"
-	"gopkg.in/mgo.v2/bson"
-)
-
-type LuaMove struct {
-	*xweb.Action
-	luaMoveManager    xweb.Mapper `xweb:"/center/luamove"`                 //站点列表
-	luaMoveSite       xweb.Mapper `xweb:"/center/luamove/site/(.*)"`       //
-	luaMoveCodeInfo   xweb.Mapper `xweb:"/center/luamove/codeinfo"`        //爬虫列表
-	luaMoveBySite     xweb.Mapper `xweb:"/center/luamove/luamovebysite"`   //按站点迁移、关闭
-	luaMoveByCode     xweb.Mapper `xweb:"/center/luamove/luamovebycode"`   //按爬虫迁移、关闭
-	updateEventBySite xweb.Mapper `xweb:"/center/spider/updateventbysite"` //更新某站点下爬虫的节点
-}
-
-type OtherBase struct {
-	IsFlow               int    //爬虫所采集数据是否参与数据流程标识
-	SpiderType           string //爬虫类型:increment增量;history历史
-	SpiderHistoryMaxPage int    //采集历史数据时的采集最大页
-	SpiderMoveEvent      string //爬虫采集完历史后要转移到的节点 comm:队列模式、bid:高性能模式、7700
-}
-
-func (lm *LuaMove) LuaMoveManager() {
-	auth := qu.IntAll(lm.GetSession("auth"))
-	if auth == role_admin {
-		if lm.Method() == "GET" {
-			events := []string{}
-			for k, _ := range util.Config.Uploadevents {
-				events = append(events, k)
-			}
-			sort.Strings(events)
-			lm.T["events"] = events
-			lm.Render("luamovesite.html")
-		} else {
-			query := bson.M{"lm_ismove": true}
-			lualist := *mgdb.Find("luaconfig", query, nil, nil, false, -1, -1)
-			data := []map[string]interface{}{}
-			siteMap := map[string][]map[string]interface{}{}
-
-			for _, l := range lualist {
-				pc := l["param_common"].([]interface{})
-				site := qu.ObjToString(pc[1])
-				href := ""
-				if len(pc) >= 12 {
-					href = qu.ObjToString(pc[11])
-				}
-				lm_movevent := l["lm_movevent"]
-				event := l["event"]
-				if tmp := siteMap[site]; tmp == nil {
-					data = append(data, map[string]interface{}{"site": site, "lm_movevent": lm_movevent, "event": event})
-					siteMap[site] = []map[string]interface{}{
-						map[string]interface{}{
-							"code":        l["code"],
-							"channel":     pc[2],
-							"event":       event,
-							"lm_movevent": lm_movevent,
-							"href":        href,
-							"lm_download": l["lm_download"],
-							"state":       l["state"],
-						},
-					}
-				} else {
-					tmp = append(tmp, map[string]interface{}{
-						"code":        l["code"],
-						"channel":     pc[2],
-						"event":       event,
-						"lm_movevent": lm_movevent,
-						"href":        href,
-						"lm_download": l["lm_download"],
-						"state":       l["state"],
-					})
-					siteMap[site] = tmp
-				}
-			}
-			lm.SetSession("sitemap", siteMap)
-			lm.ServeJson(map[string]interface{}{"data": data})
-		}
-	} else {
-		lm.Write("您没有权限")
-	}
-}
-
-func (lm *LuaMove) LuaMoveSite(site string) {
-	defer qu.Catch()
-	if lm.Method() == "GET" {
-		events := []string{}
-		for k, _ := range util.Config.Uploadevents {
-			events = append(events, k)
-		}
-		sort.Strings(events)
-		lm.T["events"] = events
-		lm.T["site"] = site
-		lm.Render("luamovecode.html", &lm.T)
-	}
-}
-
-func (lm *LuaMove) LuaMoveCodeInfo() {
-	site := lm.GetString("site")
-	sitemap := lm.GetSession("sitemap").(map[string][]map[string]interface{})
-	lm.ServeJson(map[string]interface{}{"data": sitemap[site]})
-}
-
-func (lm *LuaMove) LuaMoveBySite() {
-	defer qu.Catch()
-	site := lm.GetString("site")
-	stype := lm.GetString("stype")
-	//movevent, _ := lm.GetInteger("movevent")
-	sitemap := lm.GetSession("sitemap").(map[string][]map[string]interface{})
-	codesinfo := sitemap[site]
-	codes := []string{}
-	for _, info := range codesinfo {
-		code := qu.ObjToString(info["code"])
-		codes = append(codes, code)
-	}
-	ok := false
-	if stype == "move" { //迁移
-		ok = SpiderMoveLua(codes)
-	} else if stype == "close" { //关闭
-		ok, _ = lm.SpiderCloseMoveLua(site, codes, "site")
-	}
-	lm.ServeJson(map[string]interface{}{"ok": ok})
-}
-
-func (lm *LuaMove) LuaMoveByCode() {
-	defer qu.Catch()
-	site := lm.GetString("site")
-	code := lm.GetString("code")
-	stype := lm.GetString("stype")
-	//movevent, _ := lm.GetInteger("movevent")
-	codes := strings.Split(code, ",")
-	ok := false
-	flush := false
-	if stype == "move" { //迁移
-		ok = SpiderMoveLua(codes)
-	} else if stype == "close" { //关闭
-		ok, flush = lm.SpiderCloseMoveLua(site, codes, "code")
-	}
-	qu.Debug(ok)
-	lm.ServeJson(map[string]interface{}{"ok": ok, "flush": flush})
-}
-
-func (lm *LuaMove) UpdateEventBySite() {
-	defer qu.Catch()
-	site := lm.GetString("site")
-	movevent, _ := lm.GetInteger("movevent")
-	sitemap := lm.GetSession("sitemap").(map[string][]map[string]interface{})
-	codes := []string{}
-	for _, info := range sitemap[site] {
-		code := qu.ObjToString(info["code"])
-		codes = append(codes, code)
-		info["lm_movevent"] = movevent
-	}
-	lm.SetSession("sitemap", sitemap)
-	query := bson.M{
-		"code": bson.M{
-			"$in": codes,
-		},
-	}
-	set := bson.M{
-		"$set": bson.M{
-			"lm_movevent": movevent,
-		},
-	}
-	mgdb.Update("luaconfig", query, set, false, true)
-}
-
-//爬虫迁移
-func SpiderMoveLua(codes []string) bool {
-	defer qu.Catch()
-	for _, code := range codes {
-		lua := *mgdb.FindOne("luaconfig", map[string]interface{}{"code": code})
-		movevent := qu.IntAll(lua["lm_movevent"])
-		event := qu.IntAll(lua["event"])
-		state := qu.IntAll(lua["state"])
-		upresult := true
-		var err interface{}
-		if state < 7 || state == 4 { //无发布、需登录、无法处理、已删除状态无需下架
-			//下架
-			upresult, err = spider.UpdateSpiderByCodeState(code, "6", event) //脚本下架
-		}
-		if upresult && err == nil { //下架成功,更新节点
-			//更新节点
-			query := bson.M{
-				"code": code,
-			}
-			set := bson.M{
-				"$set": bson.M{
-					"event": movevent,
-				},
-			}
-			mgdb.Update("luaconfig", query, set, false, false)
-			//上架
-			if state == 5 { //只有是已上架状态的爬虫上架
-				upresult, err = spider.UpdateSpiderByCodeState(code, "5", movevent) //脚本上架
-				if !upresult || err != nil {
-					SendMail("爬虫定期节点迁移" + code + "上架失败")
-					qu.Debug("定期节点迁移", code, "上架失败")
-					return false
-				}
-			}
-		} else {
-			SendMail("爬虫定期节点迁移" + code + "下架失败")
-			qu.Debug("定期节点迁移", code, "下架失败")
-			return false
-		}
-	}
-	return true
-}
-
-//更新爬虫是否要迁移的状态
-func (lm *LuaMove) SpiderCloseMoveLua(site string, codes []string, by string) (bool, bool) {
-	defer qu.Catch()
-	flush := false
-	query := bson.M{
-		"code": bson.M{
-			"$in": codes,
-		},
-	}
-	set := bson.M{
-		"$set": bson.M{
-			"lm_ismove": false,
-		},
-	}
-	sitemap := lm.GetSession("sitemap").(map[string][]map[string]interface{})
-	//清除session
-	if by == "code" {
-		tmpArr := []map[string]interface{}{}
-		infoArr := sitemap[site]
-		for _, info := range infoArr {
-			flag := false
-			for _, code := range codes {
-				if qu.ObjToString(info["code"]) == code {
-					flag = true
-					break
-				}
-			}
-			if !flag {
-				tmpArr = append(tmpArr, info)
-			}
-		}
-		if len(tmpArr) == 0 {
-			delete(sitemap, site)
-			flush = true
-		} else {
-			sitemap[site] = tmpArr
-		}
-		lm.SetSession("sitemap", sitemap)
-	}
-	return mgdb.Update("luaconfig", query, set, false, true), flush
-}
-
-//
-func SpiderMoveEvent(data string) {
-	//解析爬虫代码
-	data = util.Se.DecodeString(data)
-	infos := []interface{}{}
-	err := json.Unmarshal([]byte(data), &infos)
-	if err != nil {
-		qu.Debug("历史迁移到增量节点失败:", data)
-		return
-	}
-	code := qu.ObjToString(infos[0])
-	//迁移节点并上架
-	lua := *mgdb.FindOne("luaconfig", map[string]interface{}{"code": code})
-	spidertype := qu.ObjToString(lua["spidertype"])
-	event := qu.IntAll(lua["event"])
-	var upresult bool
-	qu.Debug("lua move:", code, event)
-	if spidertype == "history" {
-		newevent := GetEvent(code, lua)
-		qu.Debug("new event:", newevent)
-		mgdb.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": map[string]interface{}{"event": newevent, "spidertype": "increment"}}, false, false)
-		upresult, err = spider.UpdateSpiderByCodeState(code, "5", newevent) //脚本上架
-	}
-	ok := false
-	if upresult && err == nil { //上架成功
-		ok = true
-		qu.Debug("Code:", code, "历史迁移到增量节点成功")
-	} else { //上架失败
-		mgdb.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": map[string]interface{}{"event": event, "state": 6}}, false, false)
-		qu.Debug("Code:", code, "历史迁移到增量节点失败")
-	}
-	mgdb.Save("luamovelog", map[string]interface{}{
-		"code":       code,
-		"comeintime": time.Now().Unix(),
-		"type":       "movevent",
-		"ok":         ok,
-	})
-}
-
-//
-func GetEvent(code string, lua map[string]interface{}) int {
-	defer qu.Catch()
-	//1、历史节点
-	if lua["historyevent"] != nil {
-		return qu.IntAll(lua["historyevent"])
-	}
-	//2、根据站点找节点
-	param_common := lua["param_common"].([]interface{})
-	site := qu.ObjToString(param_common[1])
-	query := map[string]interface{}{
-		"code": map[string]interface{}{
-			"$ne": code,
-		},
-		"param_common.1": site,
-		"state":          5,
-	}
-	tmp := *mgdb.FindOne("luaconfig", query)
-	if tmp != nil && len(tmp) > 0 {
-		return qu.IntAll(tmp["event"])
-	}
-	//3、7700
-	spidermovevent := qu.ObjToString(lua["spidermovevent"])
-	if spidermovevent == "7700" {
-		return 7700
-	}
-	//4、根据数量分配节点
-	num := 0
-	result := 7700
-	for k, t := range util.Config.Uploadevents {
-		if qu.ObjToString(t) == spidermovevent { //bid、comm
-			event := qu.IntAll(k)
-			count := mgdb.Count("luaconfig", map[string]interface{}{"state": 5, "event": event})
-			if num == 0 || count < num {
-				result = event
-				num = count
-			}
-		}
-	}
-	return result
-}
-
-func SendMail(text string) {
-	defer qu.Catch()
-	for i := 1; i <= 3; i++ {
-		res, err := http.Get(fmt.Sprintf("%s?to=%s&title=%s&body=%s", util.Config.JkMail["api"], util.Config.JkMail["to"], "lua-timeluamove-err", text))
-		if err == nil {
-			res.Body.Close()
-			read, err := ioutil.ReadAll(res.Body)
-			qu.Debug("邮件发送:", string(read), err)
-			break
-		}
-	}
-}

+ 0 - 1332
front/spider.go

@@ -1,1332 +0,0 @@
-package front
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"log"
-	"luaweb/spider"
-	"sort"
-
-	//	"math/rand"
-	u "luaweb/util"
-	mu "mfw/util"
-	qu "qfw/util"
-	mgdb "qfw/util/mongodb"
-	mgu "qfw/util/mongodbutil"
-	util "spiderutil"
-	"strings"
-	"time"
-
-	"gopkg.in/mgo.v2/bson"
-)
-
-type Base struct {
-	SpiderCode             string
-	SpiderCodeOld          string
-	SpiderName             string
-	SpiderChannel          string
-	SpiderDownDetailPage   bool
-	SpiderStartPage        int
-	SpiderMaxPage          int
-	SpiderRunRate          int
-	Spider2Collection      string
-	SpiderPageEncoding     string
-	SpiderStoreMode        int //1,2
-	SpiderStoreToMsgEvent  int
-	SpiderTargetChannelUrl string
-	SpiderLastDownloadTime string
-	SpiderIsHistoricalMend bool
-	SpiderIsMustDownload   bool
-}
-
-type Step1 struct {
-	Address        string
-	ContentChooser string
-	DateFormat     string
-	Expert         string
-	Types          int
-}
-
-type Step2 struct {
-	Listadd        string
-	Listadds       string
-	BlockChooser   string
-	AddressChooser string
-	TitleChooser   string
-	DateChooser    string
-	DateFormat     string
-	Expert         string
-	Types          int
-}
-
-type Step3 struct {
-	ContentChooser string
-	ElementChooser string
-	T_title        string
-	T_href         string
-	T_date         string
-	Expert         string
-	Types          int
-}
-
-//加载某个爬虫
-func (f *Front) LoadSpider(codeTaskIdReState string) error {
-	tmpStr := strings.Split(codeTaskIdReState, "__")
-	code := tmpStr[0]
-	taskId := tmpStr[1]
-	auth := qu.IntAll(f.GetSession("auth"))
-	restate := -1
-	if taskId == "restate=1" { //重采编辑
-		restate = 1
-	} else if taskId == "restate=2" {
-		restate = 2
-	} else if taskId == "restate=3" {
-		restate = 3
-	} else {
-		if auth == role_dev && (f.GetSession(taskId) == nil || f.GetSession(taskId) == "") {
-			xgTime := time.Unix(time.Now().Unix(), 0).Format("2006-01-02 15:04:05")
-			f.SetSession(taskId, xgTime)
-		}
-	}
-	copy := f.GetString("copy")
-	if f.Method() == "GET" {
-		code := util.Se.Decode4Hex(code)
-		f.T["actiontext"] = "编辑"
-		lua := *mgdb.FindOne("luaconfig", bson.M{"code": code})
-		auth := qu.IntAll(f.GetSession("auth"))
-		if lua["createuserid"].(string) == f.GetSession("userid").(string) || auth >= 1 {
-			if len(lua) > 0 {
-				luacopy := map[string]interface{}{}
-				if copy != "" {
-					luacopy = *mgdb.FindOne("luaconfig", bson.M{"code": copy})
-					if len(luacopy) > 0 {
-						lua["model"] = luacopy["model"]
-						common_copy := luacopy["param_common"].([]interface{})
-						common := lua["param_common"].([]interface{})
-						common_copy[0] = common[0]
-						common_copy[1] = common[1]
-						common_copy[2] = common[2]
-						common_copy[11] = common[11]
-						lua["param_common"] = luacopy["param_common"]
-						lua["param_time"] = luacopy["param_time"]
-						lua["param_list"] = luacopy["param_list"]
-						lua["param_content"] = luacopy["param_content"]
-						lua["str_list"] = luacopy["str_list"]
-						lua["str_time"] = luacopy["str_time"]
-						lua["str_content"] = luacopy["str_content"]
-						lua["Thref"] = luacopy["Thref"]
-						lua["Tpublishtime"] = luacopy["Tpublishtime"]
-						lua["Ttitle"] = luacopy["Ttitle"]
-						lua["Tdate"] = luacopy["Tdate"]
-						lua["type_content"] = luacopy["type_content"]
-						lua["type_list"] = luacopy["type_list"]
-						lua["type_time"] = luacopy["type_time"]
-					}
-				}
-				if lua["listcheck"] != nil {
-					listcheck := lua["listcheck"].(string)
-					listcheck = strings.Replace(listcheck, "\\n", "\n", -1)
-					listcheck = strings.Replace(listcheck, "\\", "", -1)
-					lua["listcheck"] = listcheck
-				}
-				if lua["contentcheck"] != nil {
-					contentcheck := lua["contentcheck"].(string)
-					contentcheck = strings.Replace(contentcheck, "\\n", "\n", -1)
-					contentcheck = strings.Replace(contentcheck, "\\", "", -1)
-					lua["contentcheck"] = contentcheck
-				}
-				js, _ := json.MarshalIndent(lua["model"], "", "  ")
-				lua["js"] = string(js)
-				f.T["lua"] = lua
-				f.T["taskId"] = taskId
-				f.T["restate"] = restate
-				f.T["isflow"] = lua["isflow"]
-				f.T["spidertype"] = lua["spidertype"]
-				f.T["spidermovevent"] = lua["spidermovevent"]
-				f.T["spiderhistorymaxpage"] = lua["spiderhistorymaxpage"]
-				if lua["oldlua"] != nil {
-					return f.Render("oldedit.html", &f.T)
-				}
-				return f.Render("spideredit.html", &f.T)
-			}
-		} else {
-			f.Write("您没有编辑他人脚本的权限")
-		}
-	}
-	return nil
-}
-
-//查看某个爬虫
-func (f *Front) ViewSpider(id string) error {
-	auth := qu.IntAll(f.GetSession("auth"))
-	if auth >= 1 {
-		if f.Method() == "GET" {
-			code := util.Se.Decode4Hex(id)
-			f.T["actiontext"] = "编辑"
-			lua := *mgdb.FindOne("luaconfig", bson.M{"code": code})
-			if len(lua) > 0 {
-				if lua["listcheck"] != nil {
-					listcheck := lua["listcheck"].(string)
-					listcheck = strings.Replace(listcheck, "\\n", "\n", -1)
-					listcheck = strings.Replace(listcheck, "\\", "", -1)
-					lua["listcheck"] = listcheck
-				}
-				if lua["contentcheck"] != nil {
-					contentcheck := lua["contentcheck"].(string)
-					contentcheck = strings.Replace(contentcheck, "\\n", "\n", -1)
-					contentcheck = strings.Replace(contentcheck, "\\", "", -1)
-					lua["contentcheck"] = contentcheck
-				}
-				js, _ := json.MarshalIndent(lua["model"], "", "  ")
-				lua["js"] = string(js)
-				f.T["lua"] = lua
-				f.T["isflow"] = lua["isflow"]
-				f.T["spidertype"] = lua["spidertype"]
-				f.T["spidermovevent"] = lua["spidermovevent"]
-				f.T["spiderhistorymaxpage"] = lua["spiderhistorymaxpage"]
-				if lua["oldlua"] != nil {
-					return f.Render("oldedit.html", &f.T)
-				}
-				return f.Render("spiderview.html", &f.T)
-			} else {
-				f.Write("没有对应记录!")
-				return nil
-			}
-		}
-		return f.Redirect("/center")
-	} else {
-		f.Write("您没有查看他人脚本的权限")
-		return nil
-	}
-}
-
-func (f *Front) LoadModel(id string) error {
-	if f.Method() == "GET" {
-		lua := *mgdb.Find("luaconfig", bson.M{"code": id}, nil, bson.M{"model": 1}, true, -1, -1)
-		if len(lua) > 0 {
-			f.ServeJson(lua[0])
-		}
-	}
-	return f.Redirect("/center")
-}
-
-func (f *Front) SaveStep() {
-	userid, _ := f.GetSession("userid").(string)
-	auth := qu.IntAll(f.GetSession("auth"))
-	rep := map[string]interface{}{}
-	if f.GetString("oldlua") != "" {
-		id := f.GetString("code")
-		one := *mgdb.FindOne("luaconfig", bson.M{"code": id})
-		id = one["code"].(string)
-		script := f.GetStringComm("script")
-		if strings.Index(script, id) == -1 {
-			rep["msg"] = "code/名称都不能更改"
-			f.ServeJson(rep)
-			return
-		} else {
-			upset := bson.M{"luacontent": script}
-			upset["modifytime"] = time.Now().Unix()
-			b := mgdb.Update("luaconfig", bson.M{"code": id}, bson.M{"$set": upset}, true, false)
-			if b {
-				rep["msg"] = "保存成功"
-				rep["code"] = util.Se.Encode2Hex(id)
-				f.ServeJson(rep)
-				return
-			}
-		}
-	} else {
-		if f.Base.SpiderName != "" && f.Base.SpiderCode != "" {
-			code := f.Base.SpiderCode
-			one := *mgdb.FindOne("luaconfig", bson.M{"code": f.Base.SpiderCode})
-			state := qu.IntAllDef(one["state"], 0)
-			restate := qu.IntAll(one["restate"])
-			comeintime := time.Now().Unix()
-			if len(one) > 0 {
-				comeintime = qu.Int64All(one["comeintime"])
-				ouserid := one["createuserid"].(string)
-				if ouserid != userid && auth == role_dev {
-					f.Write("权限不够,不能修改他人脚本")
-					return
-				} else {
-					code = one["code"].(string)
-					f.Base.SpiderCode = one["code"].(string)
-					f.Base.SpiderName = (one["param_common"].([]interface{}))[1].(string)
-				}
-			} else {
-				if auth != role_admin {
-					f.Write("不能新建爬虫,请联系管理员导入")
-					return
-				}
-			}
-			listcheck := f.GetString("listcheck")
-			contentcheck := f.GetString("contentcheck")
-			if auth == role_dev {
-				//f.Base.SpiderStoreToMsgEvent = 4002
-			}
-			common := []interface{}{
-				f.Base.SpiderCode,
-				f.Base.SpiderName,
-				f.Base.SpiderChannel,
-				f.Base.SpiderDownDetailPage,
-				f.Base.SpiderStartPage,
-				f.Base.SpiderMaxPage,
-				f.Base.SpiderRunRate,
-				f.Base.Spider2Collection,
-				f.Base.SpiderPageEncoding,
-				f.Base.SpiderStoreMode,
-				f.Base.SpiderStoreToMsgEvent,
-				f.Base.SpiderTargetChannelUrl,
-				f.Base.SpiderLastDownloadTime,
-				f.Base.SpiderIsHistoricalMend,
-				f.Base.SpiderIsMustDownload,
-			}
-			ptime := []interface{}{
-				f.Step1.DateFormat,
-				f.Step1.Address,
-				f.Step1.ContentChooser,
-			}
-			list := []interface{}{
-				f.Step2.Listadd,
-				f.Step2.Listadds,
-				f.Step2.BlockChooser,
-				f.Step2.AddressChooser,
-				f.Step2.TitleChooser,
-				f.Step2.DateChooser,
-				f.Step2.DateFormat,
-			}
-			content := []interface{}{
-				f.Step3.ContentChooser,
-				f.Step3.ElementChooser,
-			}
-			param := map[string]interface{}{}
-			common[4] = 1
-			param["param_common"] = common
-			//向导模式
-			param["param_time"] = ptime
-			param["param_list"] = list
-			param["param_content"] = content
-			param["type_time"] = f.Step1.Types
-			param["type_list"] = f.Step2.Types
-			param["type_content"] = f.Step3.Types
-			//专家模式
-			param["str_time"] = f.Step1.Expert
-			param["str_list"] = f.Step2.Expert
-			param["str_content"] = f.Step3.Expert
-			param["comeintime"] = comeintime
-			listcheck = strings.Replace(listcheck, "\n", "\\\\n", -1)
-			param["listcheck"] = strings.Replace(listcheck, "\"", "\\\\\"", -1)
-			contentcheck = strings.Replace(contentcheck, "\n", "\\\\n", -1)
-			param["contentcheck"] = strings.Replace(contentcheck, "\"", "\\\\\"", -1)
-			//补充模型
-			s_model := f.GetString("model")
-			configModel := util.Config.Model[s_model]
-			model := map[string]interface{}{}
-			for k, _ := range configModel {
-				model[k] = f.GetString(k)
-			}
-			model["model"] = s_model
-			param["code"] = f.Base.SpiderCode
-			param["model"] = model
-			if len(one) > 0 {
-				param["createuser"] = one["createuser"]
-				param["createuserid"] = one["createuserid"]
-				param["code"] = one["code"]
-				//开发员关联任务修改爬虫状态
-				state = qu.IntAll(one["state"])
-				if auth == role_dev && state >= Sp_state_3 && restate != 1 { //开发员修改,已经审核通过(不包含已上架),状态重置为待完成(restate!=1判断,重采修改保存爬虫时不修改爬虫状态)
-					param["state"] = 0
-				} else {
-					param["state"] = state
-				}
-
-			} else {
-				param["createuser"] = f.GetSession("loginuser")
-				param["createuserid"] = f.GetSession("userid")
-				param["createuseremail"] = f.GetSession("email")
-				param["next"] = f.GetSession("email")
-				param["state"] = 0
-			}
-			if qu.ObjToString(one["modifyuser"]) == "" {
-				param["modifyuser"] = param["createuser"]
-				param["modifyuserid"] = param["createuserid"]
-			}
-			param["modifytime"] = time.Now().Unix()
-			param["Ttitle"] = f.Step3.T_title
-			param["Thref"] = f.Step3.T_href
-			param["Tdate"] = f.Step3.T_date
-			//其他信息
-			param["isflow"] = f.OtherBase.IsFlow
-			param["spidertype"] = f.OtherBase.SpiderType
-			param["spidermovevent"] = f.OtherBase.SpiderMoveEvent
-			param["spiderhistorymaxpage"] = f.OtherBase.SpiderHistoryMaxPage
-			if f.OtherBase.SpiderType == "history" { //爬虫类型是history的放到7000节点,并记录历史节点
-				param["event"] = 7000
-				if event := qu.IntAll(one["event"]); event != 7000 {
-					param["historyevent"] = event
-				}
-			}
-			if f.OtherBase.SpiderMoveEvent == "7700" {
-				param["historyevent"] = 7700
-			}
-			issave := spider.SaveSpider(code, param)
-			if issave {
-				for k, v := range one {
-					if k != "_id" && param[k] == nil {
-						param[k] = v
-					}
-				}
-				Wlog(f.Base.SpiderName, f.Base.SpiderCode, f.GetSession("username").(string), f.GetSession("userid").(string), "修改", param)
-				rep["msg"] = "保存成功"
-			} else {
-				rep["msg"] = "保存失败"
-			}
-			rep["code"] = util.Se.Encode2Hex(code)
-			f.ServeJson(rep)
-		}
-	}
-}
-
-//方法测试
-func (f *Front) RunStep() {
-	imodal, _ := f.GetInteger("imodal")
-	script, _ := f.GetBool("script")
-	listcheck := f.GetString("listcheck")
-	contentcheck := f.GetString("contentcheck")
-	downloadnode := f.GetString("downloadnode") //下载节点
-	common := []interface{}{
-		f.Base.SpiderCode,
-		f.Base.SpiderName,
-		f.Base.SpiderChannel,
-		f.Base.SpiderDownDetailPage,
-		f.Base.SpiderStartPage,
-		f.Base.SpiderMaxPage,
-		f.Base.SpiderRunRate,
-		f.Base.Spider2Collection,
-		f.Base.SpiderPageEncoding,
-		f.Base.SpiderStoreMode,
-		f.Base.SpiderStoreToMsgEvent,
-		f.Base.SpiderTargetChannelUrl,
-		f.Base.SpiderLastDownloadTime,
-		f.Base.SpiderIsHistoricalMend,
-		f.Base.SpiderIsMustDownload,
-		"",
-		"",
-		"",
-	}
-	if f.Method() == "POST" {
-		switch f.GetString("step") {
-		case "step1":
-			ptime := []interface{}{
-				f.Step1.DateFormat,
-				f.Step1.Address,
-				f.Step1.ContentChooser,
-			}
-			if script {
-				_, scripts := spider.GetLastPublishTime(common, ptime, f.Step1.Expert, downloadnode, imodal, 1)
-				f.ServeJson(scripts)
-				return
-			}
-			rs, err := spider.GetLastPublishTime(common, ptime, f.Step1.Expert, downloadnode, imodal)
-			if err == nil {
-				f.ServeJson(rs)
-			}
-		case "step2":
-			addrs := strings.Split(f.Step2.Listadds, "\n")
-			if len(addrs) > 0 {
-				for k, v := range addrs {
-					addrs[k] = "'" + v + "'"
-				}
-				f.Step2.Listadds = strings.Join(addrs, ",")
-			} else if len(f.Step2.Listadds) > 5 {
-				f.Step2.Listadds = "'" + f.Step2.Listadds + "'"
-			} else {
-				f.Step2.Listadds = ""
-			}
-			list := []interface{}{
-				f.Step2.Listadd,
-				f.Step2.Listadds,
-				f.Step2.BlockChooser,
-				f.Step2.AddressChooser,
-				f.Step2.TitleChooser,
-				f.Step2.DateChooser,
-				f.Step2.DateFormat,
-			}
-			listcheck = strings.Replace(listcheck, "\n", "\\n", -1)
-			listcheck = strings.Replace(listcheck, "\"", "\\\"", -1)
-			s_model := f.GetString("model")
-			configModel := util.Config.Model[s_model]
-			model := map[string]interface{}{}
-			for k, _ := range configModel {
-				model[k] = f.GetString(k)
-			}
-			if script {
-				_, script := spider.GetPageList(common, list, model, listcheck, f.Step2.Expert, downloadnode, imodal, 1)
-				f.ServeJson(script)
-				return
-			}
-			rs, err := spider.GetPageList(common, list, model, listcheck, f.Step2.Expert, downloadnode, imodal)
-			if err == nil {
-				f.ServeJson(rs)
-			} else if err.(error).Error() == "no" {
-				f.ServeJson(rs[0])
-			}
-		case "step3":
-			content := []interface{}{
-				f.Step3.ContentChooser,
-				f.Step3.ElementChooser,
-			}
-
-			contentcheck = strings.Replace(contentcheck, "\n", "\\n", -1)
-			contentcheck = strings.Replace(contentcheck, "\"", "\\\"", -1)
-			data := map[string]interface{}{}
-			data["title"] = f.Step3.T_title
-			data["href"] = f.Step3.T_href
-			data["publishtime"] = f.Step3.T_date
-			if script {
-				_, script := spider.GetContentInfo(common, content, data, contentcheck, f.Step3.Expert, downloadnode, imodal, 1)
-				f.ServeJson(script)
-				return
-			}
-			rs, err := spider.GetContentInfo(common, content, data, contentcheck, f.Step3.Expert, downloadnode, imodal)
-			if projectinfo, ok := rs["projectinfo"].(map[string]interface{}); ok && projectinfo != nil {
-				if attachments, ok := projectinfo["attachments"].(map[string]interface{}); ok && attachments != nil {
-					for _, tmp := range attachments {
-						tmpMap := tmp.(map[string]interface{})
-						if qu.ObjToString(tmpMap["filename"]) == "附件中含有乱码" {
-							rs["msg"] = "附件中含有乱码"
-						}
-					}
-				}
-			}
-			if err == nil {
-				f.ServeJson(rs)
-			} else {
-				f.ServeJson(rs["no"])
-			}
-		}
-	}
-}
-
-//爬虫测试数据json
-func (f *Front) GetJson() {
-	list, _ := f.GetSession("listInfo").([]map[string]interface{})
-	data, _ := f.GetSession("dataInfo").(map[string]interface{})
-	descript := f.GetSession("task_descript")
-	remark := f.GetSession("task_remark")
-	reason := f.GetSession("reason")
-	username := f.GetSession("username").(string)
-	msg := f.GetSession(username + "_msg")
-	if len(data) > 0 {
-		data["contenthtml"] = ""
-	}
-	for k, v := range list {
-		v["a_index"] = k + 1
-	}
-
-	f.T["list"] = list
-	f.T["data"] = data
-	f.T["descript"] = descript
-	f.T["remark"] = remark
-	f.T["reason"] = reason
-	f.T["msg"] = msg
-
-	f.DelSession("listInfo")
-	f.DelSession("dataInfo")
-	f.DelSession("task_descript")
-	f.DelSession("task_remark")
-	f.DelSession("reason")
-
-	f.Render("jsonInfo.html", &f.T)
-}
-
-//整体测试
-func (f *Front) SpiderPass() {
-	defer mu.Catch()
-	list := []map[string]interface{}{}
-	data := map[string]interface{}{}
-	msg1 := ""
-	code := f.GetString("code")
-	downloadnode := f.GetString("node")
-	//根据code查询待确认任务
-	query := bson.M{
-		"s_code":  code,
-		"i_state": 3,
-	}
-	task := *mgdb.FindOne("task", query)
-	descript := "null"
-	remark := "null"
-	remarktmp := []string{}
-	if len(task) > 0 {
-		descript = task["s_descript"].(string)
-		if mrecord, ok := task["a_mrecord"].([]interface{}); ok {
-			for _, m := range mrecord {
-				remarkInfo := m.(map[string]interface{})
-				r := remarkInfo["s_mrecord_remark"].(string)
-				if r != "" {
-					remarktmp = append(remarktmp, r+";")
-				}
-			}
-		}
-	}
-	if len(remarktmp) > 0 {
-		remark = ""
-		remark = strings.Join(remarktmp, "")
-	}
-
-	f.SetSession("task_remark", remark)
-	f.SetSession("task_descript", descript)
-	//基本信息、方法一、方法二、方法三、总请求次数、go方法一、go方法二、go方法三、列表页条数
-	steps := []interface{}{false, false, false, false, 0, 0, 0, 0, 0}
-	one := *mgdb.FindOne("luaconfig", bson.M{"code": code})
-	reason, _ := one["reason"].(string)
-	f.SetSession("reason", reason)
-	if len(one) > 0 && one["oldlua"] == nil {
-		common := one["param_common"].([]interface{})
-		if len(common) < 13 {
-			f.ServeJson(steps)
-			return
-		} else {
-			steps[0] = true
-		}
-	} else {
-		steps[0] = true
-	}
-	script, liststr, contentstr := "", "", ""
-	if one["oldlua"] == nil {
-		script, liststr, contentstr = spider.GetScript(code)
-	} else {
-		script = one["luacontent"].(string)
-	}
-	if liststr != "" && contentstr != "" {
-		msg1 = u.SpiderPassCheckLua(liststr, contentstr, one)
-	}
-	s := spider.CreateSpider(downloadnode, script)
-	s.SpiderMaxPage = 1
-	s.Timeout = 60
-	time, timeerr := s.GetLastPublishTime()
-	if timeerr == nil && len(time) > 4 {
-		steps[1] = true
-		list, _ = s.DownListPageItem()
-		if len(list) > 0 {
-			f.SetSession("listInfo", list)
-			listone := list[0]
-			if len(qu.ObjToString(listone["href"])) < 7 ||
-				(qu.ObjToString(listone["publishtime"]) != "0" && len(qu.ObjToString(listone["publishtime"])) < 5) ||
-				len(qu.ObjToString(listone["title"])) < 3 {
-				f.ServeJson(steps)
-				return
-			} else {
-				steps[2] = true
-				if s.DownDetail {
-					param := map[string]string{}
-					index := 0
-					if len(list) > 0 {
-						steps[8] = len(list)
-						index = len(list) / 2
-						for k, v := range list[index] {
-							param[k] = qu.ObjToString(v)
-						}
-						data = map[string]interface{}{}
-						s.DownloadDetailPage(param, data)
-						if len(data) > 0 {
-							f.SetSession("dataInfo", data)
-						} else {
-							f.SetSession("dataInfo", "")
-						}
-						if len(data) == 0 || data["detail"].(string) == "" {
-							steps[3] = false
-						} else {
-							steps[3] = true
-						}
-					}
-				} else {
-					steps[3] = true
-				}
-			}
-		} else {
-			f.SetSession("listInfo", "")
-			f.SetSession("dataInfo", "")
-		}
-	}
-	//关闭laustate
-	s.L.Close()
-	steps[4] = s.Test_luareqcount
-	steps[5] = s.Test_goreqtime
-	steps[6] = s.Test_goreqlist
-	steps[7] = s.Test_goreqcon
-	//校验
-	msg := u.SpiderPassCheckListAndDetail(list, data)
-	if msg1 != "" {
-		msg = msg1 + "," + msg
-	}
-	username := f.GetSession("username").(string)
-	f.SetSession(username+"_msg", msg)
-	f.ServeJson(steps)
-}
-
-func (f *Front) DownSpider(id string) {
-	//auth := qu.IntAll(f.GetSession("auth"))
-	//if auth > role_dev {
-	one := *mgdb.FindOne("luaconfig", bson.M{"code": id})
-	script := ""
-	filename := id + ".lua"
-	if len(one) > 0 {
-		if one["oldlua"] != nil {
-			if one["luacontent"] != nil {
-				script = one["luacontent"].(string)
-			}
-		} else {
-			user := *mgdb.FindOne("user", bson.M{"_id": bson.ObjectIdHex(one["createuserid"].(string))})
-			name := one["createuser"]
-			email := user["s_email"]
-			upload := time.Now().Format("2006-01-02 15:04:05")
-			script, _, _ = spider.GetScript(id, name, email, upload)
-		}
-	}
-	f.ResponseWriter.Header().Del("Content-Type")
-	f.ResponseWriter.Header().Add("Content-Type", "application/x-download")
-	f.ResponseWriter.Header().Add("Content-Disposition", "attachment;filename=spider_"+filename)
-	f.WriteBytes([]byte(script))
-	// } else {
-	// 	f.Write("您没有权限")
-	// }
-}
-
-//更新爬虫状态
-func (f *Front) UpState() error {
-	username := f.GetSession("username").(string)
-	code := f.GetString("code")
-	state, _ := f.GetInt("state")
-	id := f.GetString("taskId")
-	reason := f.GetString("reason")
-	auth := qu.IntAll(f.GetSession("auth"))
-	var codeArr = []string{code}
-	var taskid []string
-	//修改任务状态
-	istotask := false
-	res := map[string]interface{}{
-		"istotask": istotask,
-		"err":      "没有权限",
-		"code":     util.Se.Encode2Hex(code),
-		"taskid":   taskid,
-	}
-	var xgTime int64
-	if f.GetSession(id) == nil || f.GetSession(id) == "" {
-		xgTime = time.Now().Unix()
-	} else {
-		xgTimeStr := qu.ObjToString(f.GetSession(id))
-		xgTimeTmp, _ := time.ParseInLocation("2006-01-02  15:04:05", xgTimeStr, time.Local)
-		xgTime = xgTimeTmp.Unix()
-	}
-	f.DelSession(id)
-	if IsHasUpState(auth, int(state)) {
-		b, err := UpStateAndUpSpider(code, "", reason, username, int(state)) //更新爬虫状态
-		if b && state == Sp_state_1 {                                        //提交审核
-			//有对应任务跳转提交记录页
-			taskid = checkTask(codeArr, 1)
-
-			if len(taskid) > 0 {
-				res["istotask"] = true
-				res["taskid"] = taskid[0]
-			}
-		} else if b && state == Sp_state_2 { //打回
-			taskid = checkTask(codeArr, 2)
-			if len(taskid) > 0 {
-				//UpTaskState([]string{taskid}, 2)     //修改状态
-				UpTaskState(taskid, 2, "", int64(0)) //修改任务状态
-				SaveRemark(taskid, reason, username) //保存记录信息
-			}
-		} else if b && state == Sp_state_3 { //审核通过
-			taskid = checkTask(codeArr, 3)
-			if len(taskid) > 0 {
-				//UpTaskState([]string{taskid}, 3)
-				UpTaskState(taskid, 3, "", int64(0))
-				SaveRemark(taskid, "", username)
-			}
-		} else if b && state == Sp_state_6 { //下架
-			//下架成功删除download数据
-			flag := delDownloadData(code)
-			log.Println(code, "---下架删除download数据:", flag)
-		} else if b && state == Sp_state_7 { //反馈
-			taskid = checkTask(codeArr, 7)
-			if len(taskid) > 0 {
-				UpTaskState(taskid, 7, reason, xgTime)
-			}
-		}
-
-		if err != nil {
-			res["err"] = err.Error()
-			f.ServeJson(res)
-		} else {
-			res["err"] = ""
-			f.ServeJson(res)
-		}
-	} else {
-		f.ServeJson(res)
-	}
-	return nil
-}
-
-//下架删除download数据
-func delDownloadData(code string) bool {
-	return mgu.Del("download", "spider", "spider", `{"code":"`+code+`"}`)
-}
-
-//批量作废删除download数据
-func disableDelDownloadData(code []string) {
-	for _, v := range code {
-		flag := delDownloadData(v)
-		log.Println(code, "---批量删除download数据:", flag)
-	}
-}
-
-//爬虫核对
-func (f *Front) Checktime() {
-	code := f.GetString("code")
-	auth := qu.IntAll(f.GetSession("auth"))
-	if auth != role_admin {
-		f.ServeJson(false)
-	} else {
-		b := mgdb.Update("luaconfig", `{"code":"`+code+`"}`, `{"$set":{"l_checktime":`+fmt.Sprint(time.Now().Unix())+`}}`, true, false)
-		f.ServeJson(b)
-	}
-}
-
-//批量作废
-func (f *Front) Disables() error {
-	auth := qu.IntAll(f.GetSession("auth"))
-	names := strings.Split(f.GetString("names"), ",")
-	ids := strings.Split(f.GetString("ids"), ",")
-	codes := strings.Split(f.GetString("codes"), ",")
-	disablereason := f.GetString("disablereason")
-	res := ""
-	if IsHasUpState(auth, Sp_state_4) {
-		for k, id := range ids {
-			b, err := UpStateAndUpSpider("", id, disablereason, "", Sp_state_4)
-			if b { //作废成功
-				//修改任务状态
-				UpTaskState(codes, 4, "", int64(0))
-				//删除download表数据
-				//go disableDelDownloadData(codes)
-				if err != nil {
-					res = res + names[k] + ",ok" + qu.ObjToString(err.Error()) + ";"
-				} else {
-					res = res + names[k] + ",ok" + ";"
-				}
-			} else {
-				res = res + names[k] + "," + qu.ObjToString(err.Error()) + ";"
-			}
-		}
-	} else {
-		res = "没有权限"
-	}
-	f.ServeJson(res)
-	return nil
-}
-
-//批量上下架
-func (f *Front) BatchShelves() {
-	codes := strings.Split(f.GetString("codes"), ",")
-	state, _ := f.GetInteger("state")
-	auth := qu.IntAll(f.GetSession("auth"))
-	errCode := []string{}
-	var err error
-	b := false
-	if IsHasUpState(auth, Sp_state_5) {
-		if state == 5 { //批量上架
-			for _, code := range codes {
-				_, err = UpStateAndUpSpider(code, "", "", "", Sp_state_5)
-				if err != nil {
-					errCode = append(errCode, code)
-				}
-			}
-		} else { //批量下架
-			for _, code := range codes {
-				b, err = UpStateAndUpSpider(code, "", "", "", Sp_state_6)
-				if err != nil {
-					errCode = append(errCode, code)
-				}
-				//下架删除download数据
-				if b {
-					flag := delDownloadData(code)
-					log.Println(code, "---删除download数据:", flag)
-				}
-			}
-		}
-
-	} else {
-		errCode = append(errCode, "没有权限")
-	}
-	f.ServeJson(errCode)
-}
-
-//更新爬虫状态,并判断是否更新节点爬虫
-func UpStateAndUpSpider(code, id, reason, username string, state int) (bool, error) {
-	upresult := false
-	var err error
-	one := map[string]interface{}{}
-	if code != "" {
-		one = *mgdb.FindOne("luaconfig", bson.M{"code": code})
-	} else {
-		one = *mgdb.FindOne("luaconfig", bson.M{"_id": bson.ObjectIdHex(id)})
-		code = one["code"].(string)
-	}
-	if len(one) > 0 {
-		var event int
-		if one["event"] != nil {
-			event = qu.IntAll(one["event"])
-		} else {
-			for k, _ := range util.Config.Uploadevents { //?
-				event = qu.IntAll(k)
-				break
-			}
-			//r := rand.New(rand.NewSource(time.Now().UnixNano()))
-			//event = util.Config.Uploadevents[r.Intn(len(util.Config.Uploadevents))]
-		}
-		//oldstate := qu.IntAll(one["state"])
-		switch state {
-		case Sp_state_4: //作废
-			// if oldstate == Sp_state_5 {
-			// 	upresult = false
-			// 	err = errors.New("已上架不允许作废")
-			// } else {
-			// 	upresult = true
-			// }
-			upresult, err = spider.UpdateSpiderByCodeState(code, "6", event) //下架
-		case Sp_state_5, Sp_state_6: //上下架
-			upresult, err = spider.UpdateSpiderByCodeState(code, fmt.Sprint(state), event)
-			//log.Println(upresult, err)
-		default:
-			upresult = true
-			err = nil
-		}
-		if err != nil && strings.Contains(err.Error(), "timeout") {
-			err = errors.New("连接节点" + fmt.Sprint(event) + "超时")
-			upresult = true
-		}
-
-		if upresult && err == nil {
-			upset := bson.M{"state": state} //修改状态
-			if one["oldlua"] != nil {       //老脚本上传
-				upresult = mgdb.Update("luaconfig", bson.M{"code": code}, bson.M{"$set": upset}, true, false)
-			} else {
-				if state == Sp_state_1 { //提交审核
-					upset["l_complete"] = time.Now().Unix()
-					upset["report"] = ""
-				} else if state == Sp_state_3 { //发布
-					if one["event"] == nil {
-						upset["event"] = event
-						upset["modifytime"] = time.Now().Unix()
-					}
-					upset["l_uploadtime"] = time.Now().Unix()
-				} else if state == Sp_state_2 { //打回原因
-					upset["reason"] = reason
-				} else if state == Sp_state_7 { //反馈问题
-					upset["report"] = reason
-					upset["state"] = 1 //反馈后爬虫改为待审核
-				} else if state == Sp_state_5 { //上架,核对时间重置
-					upset["l_checktime"] = 0
-				} else if state == Sp_state_4 { //作废,作废原因
-					upset["disablereason"] = reason
-					upset["modifytime"] = time.Now().Unix()
-				}
-				upresult = mgdb.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": upset}, false, false)
-				if state == Sp_state_1 { //提交审核,验证是否提交成功
-					for i := 1; i <= 5; i++ { //解决提交不上,重试5次
-						lua := *mgdb.FindOne("luaconfig", map[string]interface{}{"code": code})
-						tmpState := qu.IntAll(lua["state"])
-						if state == tmpState {
-							break
-						} else {
-							upresult = mgdb.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": upset}, false, false)
-							upresult = false
-						}
-					}
-				}
-				qu.Debug("提交日志:", code, upset, upresult)
-				if upresult && (state == Sp_state_2 || state == Sp_state_3) { //打回、审核记录日志
-					types := "打回"
-					if state == Sp_state_3 {
-						types = "审核"
-					}
-					obj := bson.M{
-						"code":       code,
-						"auditor":    username,
-						"types":      types,
-						"comeintime": time.Now().Unix(),
-						"reason":     reason,
-						"spideruser": one["createuser"],
-						"modifytime": one["modifytime"],
-					}
-					mgdb.Save("lua_logs_auditor", obj)
-				}
-			}
-		}
-	}
-	return upresult, err
-}
-
-//保存记录信息
-func SaveRemark(taskid []string, reason, username string) {
-	timeNow := time.Now().Unix()
-	if reason == "" {
-		reason = "审核通过"
-	}
-	for _, id := range taskid {
-		query := bson.M{
-			"_id": bson.ObjectIdHex(string(id)),
-		}
-		task := *mgdb.FindOne("task", query)
-		if task != nil {
-			checkData := task["a_check"]
-			var checkArr []map[string]interface{}
-			newData := make(map[string]interface{})
-
-			newData["s_check_checkUser"] = username
-			newData["l_check_checkTime"] = timeNow
-			newData["s_check_checkRemark"] = reason
-			if checkData != nil {
-				myArr := qu.ObjArrToMapArr(checkData.([]interface{}))
-				if myArr != nil && len(myArr) > 0 {
-					for _, v := range myArr {
-						checkArr = append(checkArr, v)
-					}
-				}
-			}
-			checkArr = append(checkArr, newData)
-			task["a_check"] = checkArr
-
-			mgdb.Update("task", query, map[string]interface{}{
-				"$set": task,
-			}, false, false)
-		}
-	}
-}
-
-//修改任务状态
-func UpTaskState(code []string, num int, reason string, startTime int64) {
-	query := bson.M{}
-	update := bson.M{}
-	for _, v := range code {
-		if num == 1 || num == 2 || num == 3 || num == 7 {
-			query = bson.M{
-				"_id": bson.ObjectIdHex(v),
-			}
-		} else {
-			query = bson.M{
-				"s_code": v,
-			}
-		}
-
-		if num == 1 { //提交审核
-			update = bson.M{
-				"$set": bson.M{
-					"i_state": 3,
-				},
-			}
-		} else if num == 2 { //打回  -->未通过
-			update = bson.M{
-				"$set": bson.M{
-					"i_state": 5,
-				},
-			}
-		} else if num == 3 { //发布(审核通过)  -->审核通过
-			update = bson.M{
-				"$set": bson.M{
-					"i_state": 4,
-				},
-			}
-		} else if num == 4 { //批量作废  -->关闭
-			update = bson.M{
-				"$set": bson.M{
-					"i_state":    6,
-					"l_complete": time.Now().Unix(),
-				},
-			}
-		} else if num == 7 { //反馈信息 -->待审核
-			newData := map[string]interface{}{
-				"l_mrecord_comeintime": startTime,
-				"l_mrecord_complete":   time.Now().Unix(),
-				"s_mrecord_remark":     reason,
-			}
-			mrecord := []interface{}{}
-			mrecord = append(mrecord, newData)
-			update = bson.M{
-				"$set": bson.M{
-					"i_state":    3,
-					"l_complete": time.Now().Unix(),
-					"a_mrecord":  mrecord,
-				},
-			}
-		}
-		flag := mgdb.Update("task", query, update, false, true)
-		log.Println("codeOrId:", query, "	修改任务状态:", flag)
-	}
-}
-
-//更新节点
-func (f *Front) ChangeEvent() {
-	auth := qu.IntAll(f.GetSession("auth"))
-	if auth != role_admin {
-		f.ServeJson("没有权限")
-	}
-	code := f.GetString("code")
-	event, _ := f.GetInt("event")
-	eventok := false
-	for k, _ := range util.Config.Uploadevents {
-		if event == qu.Int64All(k) {
-			eventok = true
-			break
-		}
-	}
-	if !eventok {
-		f.ServeJson("没有对应节点")
-		return
-	}
-	info := *mgdb.FindOne("luaconfig", `{"code":"`+code+`"}`)
-	if len(info) > 0 {
-		oldevent := qu.IntAll(info["event"])
-		if qu.IntAll(info["state"]) == Sp_state_5 {
-			//源节点下架
-			_, err := spider.UpdateSpiderByCodeState(code, fmt.Sprint(Sp_state_6), oldevent)
-			set := map[string]interface{}{
-				"$set": map[string]interface{}{
-					"event": qu.IntAll(event),
-					"state": Sp_state_6,
-				},
-			}
-			mgdb.Update("luaconfig", `{"code":"`+code+`"}`, set, true, false)
-			if err != nil && strings.Contains(err.Error(), "timeout") {
-				f.ServeJson("连接节点" + fmt.Sprint(oldevent) + "超时")
-			} else {
-				f.ServeJson(err.Error())
-			}
-		} else {
-			set := map[string]interface{}{
-				"$set": map[string]interface{}{
-					"event": qu.IntAll(event),
-				},
-			}
-			mgdb.Update("luaconfig", `{"code":"`+code+`"}`, set, true, false)
-		}
-	} else {
-		f.ServeJson("没有对应记录")
-	}
-}
-
-//验证用户是否有更改状态权限
-func IsHasUpState(auth, state int) bool {
-	rep := false
-	switch auth {
-	case role_dev:
-		if state == Sp_state_1 || state == Sp_state_7 {
-			rep = true
-		}
-	case role_examine:
-		if state == Sp_state_2 || state == Sp_state_3 {
-			rep = true
-		}
-	case role_admin:
-		rep = true
-	default:
-	}
-	return rep
-}
-
-var list_fields = `{"_id":1,"code":1,"createuser":1,"modifyuser":1,"modifytime":1,"l_uploadtime":1,"l_checktime":1,"state":1,"param_common":1,"event":1,"urgency":1}`
-
-//脚本管理,结合爬虫运行信息
-func (f *Front) LuaList() {
-	auth := qu.IntAll(f.GetSession("auth"))
-	if auth != role_admin {
-		f.ServeJson("没有权限!")
-		return
-	}
-	if f.Method() == "POST" {
-		state, _ := f.GetInteger("state")
-		event, _ := f.GetInteger("event")
-		start, _ := f.GetInteger("start")
-		limit, _ := f.GetInteger("length")
-		draw, _ := f.GetInteger("draw")
-		searchStr := f.GetString("search[value]")
-		//search := strings.Replace(searchStr, " ", "", -1)
-		search := strings.TrimSpace(searchStr)
-		query := bson.M{}
-
-		q1 := bson.M{}
-		q1["$or"] = []interface{}{
-			bson.M{"code": bson.M{"$regex": search}},
-			bson.M{"createuser": bson.M{"$regex": search}},
-			bson.M{"param_common.1": bson.M{"$regex": search}},
-		}
-		q2 := bson.M{}
-		if state > -1 {
-			q2 = bson.M{"state": state}
-		} else {
-			q2["$or"] = []interface{}{
-				bson.M{"state": Sp_state_3},
-				bson.M{"state": Sp_state_5},
-				bson.M{"state": Sp_state_6},
-			}
-		}
-		q3 := bson.M{}
-		if event > -1 {
-			q3 = bson.M{"event": event}
-		}
-		if search != "" {
-			query["$and"] = []interface{}{q1, q2, q3}
-		} else {
-			query["$and"] = []interface{}{q2, q3}
-		}
-		sort := `{"%s":%d}`
-		orderIndex := f.GetString("order[0][column]")
-		orderName := f.GetString(fmt.Sprintf("columns[%s][data]", orderIndex))
-		orderType := 1
-		if f.GetString("order[0][dir]") != "asc" {
-			orderType = -1
-		}
-		sort = fmt.Sprintf(sort, orderName, orderType)
-		page := start / 10
-		luas := *mgdb.Find("luaconfig", query, sort, list_fields, false, start, limit)
-		count := mgdb.Count("luaconfig", query)
-		for k, v := range luas {
-			v["num"] = k + 1 + page*10
-			l_uploadtime := qu.Int64All(v["l_uploadtime"])
-			v["l_uploadtime"] = qu.FormatDateByInt64(&l_uploadtime, qu.Date_Full_Layout)
-			l_checktime := qu.Int64All(v["l_checktime"])
-			v["l_checktime"] = qu.FormatDateByInt64(&l_checktime, qu.Date_Full_Layout)
-			if l_checktime > 0 { //核对
-				v["is_check"] = true
-			} else { //未核对
-				v["is_check"] = false
-			}
-			if tmp, ok := spinfos.Load(v["code"]); ok {
-				info := tmp.(*spinfo)
-				v["modifytime"] = info.lastHeartbeat
-				v["yesterday"] = fmt.Sprint(info.yesterdayDowncount) + "/" + fmt.Sprint(info.yestoDayRequestNum)
-				v["terday"] = fmt.Sprint(info.todayDowncount) + "/" + fmt.Sprint(info.toDayRequestNum)
-				v["lastdowncount"] = info.lastDowncount
-				v["lstate"] = info.lstate
-			} else {
-				v["modifytime"] = ""
-				v["yesterday"] = ""
-				v["terday"] = ""
-				v["lastdowncount"] = 0
-				v["lstate"] = ""
-			}
-		}
-		f.ServeJson(map[string]interface{}{"draw": draw, "data": luas, "recordsFiltered": count, "recordsTotal": count})
-	} else {
-		events := []string{}
-		for k, _ := range util.Config.Uploadevents {
-			events = append(events, k)
-		}
-		sort.Strings(events)
-		f.T["events"] = events
-		f.Render("lualist.html", &f.T)
-	}
-}
-
-//爬虫信息
-type spinfo struct {
-	code                                   string
-	todayDowncount, toDayRequestNum        int
-	yesterdayDowncount, yestoDayRequestNum int
-	totalDowncount, totalRequestNum        int
-	errorNum, roundCount, runRate          int
-	lastDowncount                          int
-	lastHeartbeat                          string
-	lstate                                 string
-}
-
-//爬虫信息
-func SpiderInfo(data string) {
-	data = util.Se.DecodeString(data)
-	infos := []map[string]interface{}{}
-	err := json.Unmarshal([]byte(data), &infos)
-	if err != nil {
-		return
-	}
-	for _, tmp := range infos {
-		lastHeartbeat := qu.Int64All(tmp["lastHeartbeat"])
-		info := &spinfo{
-			code:               fmt.Sprint(tmp["code"]),
-			todayDowncount:     qu.IntAll(tmp["todayDowncount"]),
-			toDayRequestNum:    qu.IntAll(tmp["toDayRequestNum"]),
-			yesterdayDowncount: qu.IntAll(tmp["yesterdayDowncount"]),
-			yestoDayRequestNum: qu.IntAll(tmp["yestoDayRequestNum"]),
-			totalDowncount:     qu.IntAll(tmp["totalDowncount"]),
-			totalRequestNum:    qu.IntAll(tmp["totalRequestNum"]),
-			errorNum:           qu.IntAll(tmp["errorNum"]),
-			roundCount:         qu.IntAll(tmp["roundCount"]),
-			runRate:            qu.IntAll(tmp["runRate"]),
-			lastHeartbeat:      qu.FormatDateByInt64(&lastHeartbeat, qu.Date_Full_Layout),
-			lastDowncount:      qu.IntAll(tmp["lastDowncount"]),
-			lstate:             fmt.Sprint(tmp["lstate"]),
-		}
-		spinfos.Store(info.code, info)
-		//log.Println(info)
-	}
-}
-
-//接受维护任务信息
-func SpiderModifyTask(data string) {
-	data = util.Se.DecodeString(data)
-	mtasks := []map[string]interface{}{}
-	err := json.Unmarshal([]byte(data), &mtasks)
-	if err != nil {
-		return
-	}
-	for k, tmp := range mtasks {
-		log.Println(k, tmp)
-	}
-}
-
-//查看是否有该任务
-func checkTask(codes []string, num int) []string {
-	//	var id string = ""
-	query := bson.M{}
-	var idArr []string
-	if len(codes) > 0 {
-		for _, v := range codes {
-			if num == 1 {
-				query = bson.M{
-					"s_code": v,
-					"i_state": bson.M{
-						"$in": []int{1, 2, 5},
-					},
-				}
-			} else if num == 2 { //打回时查询待审核的任务
-				query = bson.M{
-					"s_code":  v,
-					"i_state": 3,
-				}
-			} else if num == 3 { //审核通过时查询待处理、处理中、待审核、未通过的任务
-				query = bson.M{
-					"s_code": v,
-					"i_state": bson.M{
-						"$in": []int{1, 2, 3, 5},
-					},
-				}
-			} else if num == 7 {
-				query = bson.M{
-					"s_code": v,
-					"i_state": bson.M{
-						"$in": []int{2, 5},
-					},
-				}
-			}
-			//task := *mgdb.FindOne("task", query)
-			task := *mgdb.Find("task", query, nil, nil, false, -1, -1)
-			if task != nil {
-				for _, v := range task {
-					//id = v["_id"].(bson.ObjectId).Hex()
-					idArr = append(idArr, v["_id"].(bson.ObjectId).Hex())
-				}
-			}
-			return idArr
-		}
-	}
-	return idArr
-}

+ 0 - 480
luaerrdata/errdata.go

@@ -1,480 +0,0 @@
-package luaerrdata
-
-import (
-	"encoding/json"
-	"luaweb/spider"
-	"luaweb/udp"
-	qu "qfw/util"
-	mgdb "qfw/util/mongodb"
-	mgu "qfw/util/mongodbutil"
-	util "spiderutil"
-	"strings"
-	"time"
-
-	"github.com/go-xweb/xweb"
-	"gopkg.in/mgo.v2/bson"
-)
-
-const role_admin, role_examine, role_dev = 3, 2, 1 //管理员,审核员,开发员
-var Text = "重采失败,请稍后重试"
-
-type LuaInfo struct {
-	ModifyUser string //爬虫修改人
-	ReState    int    //重采状态
-	State      int    //爬虫状态
-	Event      int    //节点
-	StateTime  int64  //重采状态对应的时间
-	AllErrNum  int    //所有数据对应的爬虫总量
-	ErrNum     int    //采集失败量
-	ReErrNum   int    //重采失败量
-	SaveErrNum int    //保存失败量
-}
-
-type ErrorData struct {
-	*xweb.Action
-	errorDataIndex  xweb.Mapper `xweb:"/center/errorData"`                 //加载错误数据
-	findByCode      xweb.Mapper `xweb:"/center/errorData/findByCode"`      //根据爬虫找所有错误数据
-	regatherData    xweb.Mapper `xweb:"/center/errorData/regatherData"`    //数据重采
-	singleRegather  xweb.Mapper `xweb:"/center/errorData/singleRegather"`  //单个信息重采
-	confirmLua      xweb.Mapper `xweb:"/center/errorData/confirmLua"`      //确认爬虫
-	updateRestate   xweb.Mapper `xweb:"/center/errorData/updateRestate"`   //修改restae状态
-	updateOnlineLua xweb.Mapper `xweb:"/center/errorData/updateonlinelua"` //重新上架
-	confirmRepair   xweb.Mapper `xweb:"/center/errorData/confirmrepair"`   //确认修复
-}
-
-func (ed *ErrorData) ErrorDataIndex() {
-	defer qu.Catch()
-	auth := qu.IntAll(ed.GetSession("auth"))
-	searchStr := ed.GetString("search[value]")
-	search := strings.TrimSpace(searchStr)
-	date := ed.GetString("date")
-	user := qu.ObjToString(ed.GetSession("loginuser"))
-	//if auth == role_admin {
-	if ed.Method() == "POST" {
-		startTime, endTime := GetStartAndEndTime(date)
-		if startTime == 0 || endTime == 0 {
-			return
-		}
-		query := map[string]interface{}{
-			"state":      bson.M{"$lte": 3}, //查询state==3及修复成功的数据是为了在页面展示该数据的爬虫方便“更新上架”,“确认修复”
-			"from":       "lua",
-			"comeintime": bson.M{"$gte": startTime, "$lte": endTime},
-		}
-		if auth == 1 {
-			query["modifyuser"] = user
-		}
-		if search != "" {
-			query = bson.M{"spidercode": bson.M{"$regex": search}}
-		}
-		qu.Debug("query:", query)
-		data := []map[string]interface{}{}
-		list := *mgu.Find("regatherdata", "spider", "spider", query, nil, nil, false, -1, -1)
-		if len(list) > 0 {
-			//alltmp := map[string]int{}
-			errtmp := map[string]int{}
-			rerrtmp := map[string]int{}
-			saverrtmp := map[string]int{}
-			successtmp := map[string]int{}
-			codeLua := map[string]*LuaInfo{}
-			for _, l := range list {
-				code := qu.ObjToString(l["spidercode"])
-				state := qu.IntAll(l["state"])
-				//alltmp[code] = alltmp[code] + 1
-				if codeLua[code] == nil {
-					data := *mgdb.FindOne("luaconfig", map[string]interface{}{"code": code})
-					restate := qu.IntAll(data["restate"])
-					info := &LuaInfo{
-						ModifyUser: qu.ObjToString(data["modifyuser"]),
-						ReState:    restate,
-						State:      qu.IntAll(data["state"]),
-						Event:      qu.IntAll(data["event"]),
-						StateTime:  int64(0),
-					}
-					if restate == 4 {
-						info.StateTime = qu.Int64All(data["updatetime"])
-					} else if restate == 3 {
-						info.StateTime = qu.Int64All(data["auditime"])
-					} else if restate == 2 {
-						info.StateTime = qu.Int64All(data["repairtime"])
-					} else if restate == 1 {
-						info.StateTime = qu.Int64All(data["confirmtime"])
-					}
-					codeLua[code] = info
-				}
-				if state == 0 { //错误
-					errtmp[code] = errtmp[code] + 1
-				} else if state == 1 { //重下失败
-					rerrtmp[code] = rerrtmp[code] + 1
-				} else if state == 2 { //保存服务发送失败
-					saverrtmp[code] = saverrtmp[code] + 1
-				} else { //已修复数据
-					successtmp[code] = successtmp[code] + 1
-				}
-			}
-			vs_err := MapValueSort(errtmp) //采集错误量排序
-			for i := vs_err.Len() - 1; i >= 0; i-- {
-				spidercode := vs_err.Keys[i]
-				data = append(data, map[string]interface{}{
-					"spidercode": spidercode,
-					"encode":     util.Se.Encode2Hex(spidercode),
-					"errnum":     vs_err.Vals[i],
-					"rerrnum":    rerrtmp[spidercode],
-					"saverrnum":  saverrtmp[spidercode],
-					"num":        vs_err.Len() - i,
-					"modifyuser": codeLua[spidercode].ModifyUser,
-					"restate":    codeLua[spidercode].ReState,
-					"state":      codeLua[spidercode].State,
-					"statetime":  codeLua[spidercode].StateTime,
-					"event":      codeLua[spidercode].Event,
-				})
-				//delete(alltmp, spidercode)
-				delete(rerrtmp, spidercode)    //去除有采集失败的爬虫
-				delete(saverrtmp, spidercode)  //去除有采集失败的爬虫
-				delete(successtmp, spidercode) //去除有采集失败的爬虫
-			}
-			count := vs_err.Len()
-			vs_reerr := MapValueSort(rerrtmp) //重采错误数据量排序
-			for j := vs_reerr.Len() - 1; j >= 0; j-- {
-				count++
-				spidercode := vs_reerr.Keys[j]
-				data = append(data, map[string]interface{}{
-					"spidercode": spidercode,
-					"encode":     util.Se.Encode2Hex(spidercode),
-					"errnum":     0,
-					"rerrnum":    rerrtmp[spidercode],
-					"saverrnum":  saverrtmp[spidercode],
-					"num":        count,
-					"modifyuser": codeLua[spidercode].ModifyUser,
-					"restate":    codeLua[spidercode].ReState,
-					"state":      codeLua[spidercode].State,
-					"statetime":  codeLua[spidercode].StateTime,
-					"event":      codeLua[spidercode].Event,
-				})
-				delete(saverrtmp, spidercode)  //去除有采集失败的爬虫
-				delete(successtmp, spidercode) //去除有采集失败的爬虫
-			}
-
-			for spidercode, _ := range saverrtmp {
-				count++
-				data = append(data, map[string]interface{}{
-					"spidercode": spidercode,
-					"encode":     util.Se.Encode2Hex(spidercode),
-					"errnum":     0,
-					"rerrnum":    0,
-					"saverrnum":  saverrtmp[spidercode],
-					"num":        count,
-					"modifyuser": codeLua[spidercode].ModifyUser,
-					"restate":    codeLua[spidercode].ReState,
-					"state":      codeLua[spidercode].State,
-					"statetime":  codeLua[spidercode].StateTime,
-					"event":      codeLua[spidercode].Event,
-				})
-				delete(successtmp, spidercode) //去除有采集失败的爬虫
-			}
-			for spidercode, _ := range successtmp {
-				count++
-				data = append(data, map[string]interface{}{
-					"spidercode": spidercode,
-					"encode":     util.Se.Encode2Hex(spidercode),
-					"errnum":     0,
-					"rerrnum":    0,
-					"saverrnum":  0,
-					"num":        count,
-					"modifyuser": codeLua[spidercode].ModifyUser,
-					"restate":    codeLua[spidercode].ReState,
-					"state":      codeLua[spidercode].State,
-					"statetime":  codeLua[spidercode].StateTime,
-					"event":      codeLua[spidercode].Event,
-				})
-			}
-			// for code, _ := range alltmp {
-			// 	i++
-			// 	data = append(data, map[string]interface{}{
-			// 		"spidercode": code,
-			// 		"encode":     util.Se.Encode2Hex(code),
-			// 		"errnum":     0,
-			// 		"rerrnum":    rerrtmp[code],
-			// 		"saverrnum":  saverrtmp[code],
-			// 		"num":        i,
-			// 		"modifyuser": codeLua[code].ModifyUser,
-			// 		"restate":    codeLua[code].ReState,
-			// 		"state":      codeLua[code].State,
-			// 		"statetime":  codeLua[code].StateTime,
-			// 		"event":      codeLua[code].Event,
-			// 	})
-			// }
-			//alltmp = map[string]int{}
-			errtmp = map[string]int{}
-			rerrtmp = map[string]int{}
-			saverrtmp = map[string]int{}
-			codeLua = map[string]*LuaInfo{}
-		}
-		ed.ServeJson(map[string]interface{}{"data": data})
-	} else {
-		now := time.Now().AddDate(0, 0, -1)
-		ed.T["date"] = qu.FormatDate(&now, qu.Date_Short_Layout)
-		ed.Render("errdata.html", &ed.T)
-	}
-	// } else {
-	// 	ed.Write("您没有权限")
-	// }
-	//ed.Write("数据错误")
-}
-
-func (ed *ErrorData) FindByCode() {
-	defer qu.Catch()
-	code := ed.GetString("code")
-	date := ed.GetString("date")
-	if ed.Method() == "GET" {
-		restate, _ := ed.GetInteger("restate")
-		ed.T["date"] = date
-		ed.T["code"] = ed.GetString("code")
-		ed.T["restate"] = restate
-		ed.Render("errhreflist.html", &ed.T)
-	} else if ed.Method() == "POST" {
-		startTime, endTime := GetStartAndEndTime(date)
-		if startTime == 0 || endTime == 0 {
-			return
-		}
-		start, _ := ed.GetInteger("start")
-		limit, _ := ed.GetInteger("length")
-		draw, _ := ed.GetInteger("draw")
-		state, _ := ed.GetInteger("state")
-		q_state := bson.M{}
-		if state == -1 {
-			q_state = bson.M{"$lt": 3}
-		} else {
-			q_state = bson.M{"$eq": state}
-		}
-		query := bson.M{
-			"from":       "lua",
-			"spidercode": code,
-			"state":      q_state,
-			"comeintime": bson.M{"$gte": startTime, "$lte": endTime},
-		}
-		qu.Debug("query:", query)
-		page := start / 10
-		data := *mgu.Find("regatherdata", "spider", "spider", query, `{"state":1}`, `{"href":1,"spidercode":1,"state":1,comeintime:1}`, false, start, limit)
-		count := mgu.Count("regatherdata", "spider", "spider", query)
-		if data != nil {
-			for k, d := range data {
-				d["num"] = k + 1 + page*10
-				state := qu.IntAll(d["state"])
-				if state == 0 {
-					d["state"] = "采集失败"
-				} else if state == 1 {
-					d["state"] = "重采失败"
-				} else if state == 2 {
-					d["state"] = "保存失败"
-				}
-				comeintime := qu.Int64All(d["comeintime"])
-				d["comeintime"] = qu.FormatDateByInt64(&comeintime, qu.Date_Full_Layout)
-			}
-		}
-		ed.ServeJson(map[string]interface{}{"draw": draw, "data": data, "recordsFiltered": count, "recordsTotal": count})
-	}
-	return
-}
-
-//重采
-func (ed *ErrorData) RegatherData() {
-	defer qu.Catch()
-	codes := ed.GetString("codes")
-	date := ed.GetString("date")
-	state, _ := ed.GetInteger("state")
-	if len(codes) > 0 {
-		start, end := GetStartAndEndTime(date)
-		save := map[string]interface{}{
-			"start":    start,
-			"end":      end,
-			"state":    state,
-			"codeorid": strings.Split(codes, ","),
-			"isrun":    false,
-			"type":     "code",
-		}
-		if id := mgu.Save("regatherudp", "spider", "spider", save); id != "" {
-			qu.Debug("发送udp", id)
-			udpMap := map[string]interface{}{
-				"udpid": id,
-			}
-			by, err := json.Marshal(udpMap)
-			if err == nil && !udp.IsSendUdp {
-				udp.SendUdpLock.Lock()
-				udp.SendUdp(by) //发送udp
-				select {
-				case info := <-udp.Ch:
-					udp.IsSendUdp = false
-					ed.ServeJson(info)
-				case <-time.After(time.Second * 10):
-					go func() {
-						q := map[string]interface{}{"_id": qu.StringTOBsonId(id)}
-						s := map[string]interface{}{"$set": map[string]interface{}{"isrun": true, "remark": "Udp发送失败"}}
-						mgu.Update("regatherudp", "spider", "spider", q, s, false, false)
-					}()
-					udp.IsSendUdp = false
-					ed.ServeJson("重新采集失败,请稍后重试")
-				}
-				udp.SendUdpLock.Unlock()
-			}
-			ed.ServeJson(Text)
-		} else {
-			ed.ServeJson("Udp条件保存失败")
-		}
-	} else {
-		ed.ServeJson("爬虫代码选择出错")
-	}
-}
-
-func (ed *ErrorData) SingleRegather() {
-	defer qu.Catch()
-	code := ed.GetString("code")
-	date := ed.GetString("date")
-	state, _ := ed.GetInteger("state")
-	id := ed.GetString("id")
-	start, end := GetStartAndEndTime(date)
-	save := map[string]interface{}{
-		"start": start,
-		"end":   end,
-		"state": state,
-		"isrun": false,
-	}
-	if id != "" {
-		save["codeorid"] = []string{id}
-		save["type"] = "id"
-	} else if id == "" && state == -1 { //全部重采
-		save["codeorid"] = []string{code}
-		save["type"] = "code"
-	}
-	if id := mgu.Save("regatherudp", "spider", "spider", save); id != "" {
-		qu.Debug("发送udp", id)
-		udpMap := map[string]interface{}{
-			"udpid": id,
-		}
-		by, err := json.Marshal(udpMap)
-		if err == nil && !udp.IsSendUdp {
-			udp.SendUdpLock.Lock()
-			udp.SendUdp(by) //发送udp
-			select {
-			case info := <-udp.Ch:
-				udp.IsSendUdp = false
-				ed.ServeJson(info)
-			case <-time.After(time.Second * 10):
-				go func() {
-					q := map[string]interface{}{"_id": qu.StringTOBsonId(id)}
-					s := map[string]interface{}{"$set": map[string]interface{}{"isrun": true, "remark": "Udp发送失败"}}
-					mgu.Update("regatherudp", "spider", "spider", q, s, false, false)
-				}()
-				udp.IsSendUdp = false
-				ed.ServeJson("重新采集失败,请稍后重试")
-			}
-			udp.SendUdpLock.Unlock()
-		}
-		ed.ServeJson(Text)
-	} else {
-		ed.ServeJson("Udp条件保存失败")
-	}
-}
-
-func (ed *ErrorData) ConfirmLua() {
-	defer qu.Catch()
-	codes := ed.GetString("codes")
-	state := true
-	for _, code := range strings.Split(codes, ",") {
-		lua := *mgdb.FindOne("luaconfig", map[string]interface{}{"code": code})
-		if restate := qu.IntAll(lua["restate"]); restate == 0 || restate == 4 || restate == 3 { //0是未修复过的爬虫;4是已经修复过的爬虫
-			b := mgdb.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": map[string]interface{}{"restate": 1, "confirmtime": time.Now().Unix()}}, false, false)
-			if !b {
-				state = false
-			}
-		}
-	}
-	ed.ServeJson(map[string]interface{}{"state": state})
-}
-
-func (ed *ErrorData) UpdateRestate() {
-	defer qu.Catch()
-	code := ed.GetString("code")
-	restateTmp, _ := ed.GetInteger("restate")
-	lua := *mgdb.FindOne("luaconfig", map[string]interface{}{"code": code})
-	restate := qu.IntAll(lua["restate"])
-	if restate == 0 {
-		ed.ServeJson("该爬虫未确认")
-		return
-	}
-	set := map[string]interface{}{}
-	if restateTmp == 1 { //提交审核
-		if restate > 1 {
-			ed.ServeJson("该爬虫已修复")
-			return
-		}
-		set["restate"] = 2
-		set["repairtime"] = time.Now().Unix()
-	} else if restateTmp == 2 { //审核通过
-		if restate < 2 {
-			ed.ServeJson("该爬虫未修复")
-			return
-		}
-		set["restate"] = 3
-		set["auditime"] = time.Now().Unix()
-	}
-	b := mgdb.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": set}, false, false)
-	text := ""
-	if restateTmp == 1 {
-		if b {
-			text = "提交修复成功"
-		} else {
-			text = "提交修复失败"
-		}
-	} else if restateTmp == 2 {
-		if b {
-			text = "审核成功"
-		} else {
-			text = "审核失败"
-		}
-	}
-	ed.ServeJson(text)
-}
-
-func (ed *ErrorData) UpdateOnlineLua() {
-	defer qu.Catch()
-	code := ed.GetString("code")
-	lua := *mgdb.FindOne("luaconfig", map[string]interface{}{"code": code})
-	if qu.IntAll(lua["state"]) != 5 { //非上架爬虫,不能更新
-		ed.ServeJson(map[string]interface{}{"state": false})
-		return
-	}
-	event := qu.IntAll(lua["event"])
-	b, err := spider.UpdateSpiderByCodeState(code, "-1", event)
-	if b && err == nil {
-		mgdb.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": map[string]interface{}{"restate": 4, "updatetime": time.Now().Unix()}}, false, false)
-		ed.ServeJson(map[string]interface{}{"state": true})
-	} else {
-		ed.ServeJson(map[string]interface{}{"state": false})
-	}
-}
-
-func (ed *ErrorData) ConfirmRepair() {
-	defer qu.Catch()
-	codes := ed.GetString("codes")
-	data := []string{}
-	for _, code := range strings.Split(codes, ",") {
-		if code == "" {
-			continue
-		}
-		if !mgdb.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": map[string]interface{}{"restate": 4, "updatetime": time.Now().Unix()}}, false, false) {
-			data = append(data, code)
-		}
-	}
-	ed.ServeJson(map[string]interface{}{"data": data})
-}
-
-func GetStartAndEndTime(date string) (startTime, endTime int64) {
-	t, err := time.ParseInLocation(qu.Date_Short_Layout, date, time.Local)
-	if err != nil {
-		qu.Debug("Time Error:", err)
-		return
-	}
-	startTime = t.Unix()
-	endTime = t.AddDate(0, 0, 1).Unix()
-	return
-}

+ 0 - 44
luaerrdata/mapvaluesort.go

@@ -1,44 +0,0 @@
-//对map的value值排序
-package luaerrdata
-
-import (
-	"sort"
-)
-
-type ValSorter struct {
-	Keys []string
-	Vals []int
-}
-
-func MapValueSort(m map[string]int) *ValSorter {
-	vs := NewValSorter(m)
-	vs.Sort()
-	return vs
-}
-
-func NewValSorter(m map[string]int) *ValSorter {
-	vs := &ValSorter{
-		Keys: make([]string, 0, len(m)),
-		Vals: make([]int, 0, len(m)),
-	}
-	for k, v := range m {
-		vs.Keys = append(vs.Keys, k)
-		vs.Vals = append(vs.Vals, v)
-	}
-	return vs
-}
-
-func (vs *ValSorter) Sort() {
-	sort.Sort(vs)
-}
-
-func (vs *ValSorter) Len() int {
-	return len(vs.Vals)
-}
-func (vs *ValSorter) Less(i, j int) bool {
-	return vs.Vals[i] < vs.Vals[j]
-}
-func (vs *ValSorter) Swap(i, j int) {
-	vs.Vals[i], vs.Vals[j] = vs.Vals[j], vs.Vals[i]
-	vs.Keys[i], vs.Keys[j] = vs.Keys[j], vs.Keys[i]
-}

+ 0 - 118
main.go

@@ -1,118 +0,0 @@
-package main
-
-import (
-	_ "luaweb/filter"
-	"luaweb/front"
-	"luaweb/quesManager"
-	"luaweb/spider"
-
-	//. "luaweb/task"
-	"luaweb/luaerrdata"
-	"luaweb/taskManager"
-	"luaweb/tomail"
-	"luaweb/udp"
-
-	u "luaweb/util"
-	"net/http"
-	qu "qfw/util"
-	mgdb "qfw/util/mongodb"
-	mgu "qfw/util/mongodbutil"
-	"qfw/util/redis"
-
-	//"spiderutil"
-	util "spiderutil"
-	"time"
-
-	"github.com/go-xweb/httpsession"
-	"github.com/go-xweb/xweb"
-	"github.com/yuin/gopher-lua"
-)
-
-func init() {
-	//qu.ReadConfig("config.json", &tomail.Mail)
-	front.SessMap = make(map[string]*httpsession.Session)
-	qu.ReadConfig(&util.Config)
-	qu.ReadConfig("autoimport.json", &front.AutoTpl)
-	qu.ReadConfig("transfercode.json", &front.Transfercode)
-	//redis
-	redis.InitRedis(util.Config.Redisservers)
-	//新建连接
-	conf := *new(mgu.PoolConfig)
-	conf.Addr = util.Config.Dbaddr
-	conf.Alias = util.Config.Dbname2
-	conf.DB = util.Config.Dbname2
-	conf.Size = 10
-	mgu.Config = append(mgu.Config, conf)
-	mgu.InitMongodbPool()
-	smtp := util.Config.Smtp
-	front.Mails = util.New(smtp["addr"], qu.IntAll(smtp["port"]), smtp["user"], smtp["pwd"])
-	mgdb.InitMongodbPool(20, util.Config.Dbaddr, util.Config.Dbname)
-	lua.Disablelib(util.Config.Luadisablelib)
-	//初始化区域信息
-	u.InitAreaCity()
-	//初始化mgo
-	//u.InitMgo()
-	//xweb框架配置
-	xweb.Config.RecoverPanic = true
-	xweb.Config.Profiler = true
-	xweb.RootApp().AppConfig.TemplateDir = "web/templates"
-	xweb.RootApp().AppConfig.StaticDir = "web/staticres"
-	xweb.RootApp().AppConfig.StaticFileVersion = false
-	xweb.RootApp().AppConfig.CheckXsrf = false
-	xweb.RootApp().AppConfig.ReloadTemplates = true
-	xweb.RootApp().AppConfig.EnableHttpCache = false
-	xweb.RootApp().AppConfig.Mode = xweb.Product
-	xweb.RootApp().AppConfig.CacheTemplates = false
-	xweb.AddAction(&front.Front{})
-	xweb.AddAction(&taskManager.TaskM{})
-	xweb.AddAction(&quesManager.QuesM{})
-	xweb.AddAction(&luaerrdata.ErrorData{})
-	xweb.AddAction(&front.LuaMove{})
-	xweb.RootApp().AppConfig.SessionTimeout = 1 * time.Hour
-	xweb.RootApp().Logger.SetOutputLevel(4)
-	xweb.AddTmplVar("add", func(a, b int) int { return a + b })
-	spider.InitMsgClient(
-		qu.ObjToString(util.Config.Msgservers["comm"]["addr"]),
-		qu.ObjToString(util.Config.Msgservers["bid"]["addr"]),
-		qu.ObjToString(util.Config.Msgservers["test"]["addr"]),
-		qu.ObjToString(util.Config.Msgservers["comm"]["name"]),
-		qu.ObjToString(util.Config.Msgservers["bid"]["name"]),
-		qu.ObjToString(util.Config.Msgservers["test"]["name"]),
-	)
-	spider.InitMsgClientFile(util.Config.MsgserveraddrFile, util.Config.Msgname+"file")
-
-	//初始化网络存储服务
-	//util.InitWeedcl()
-	util.OssInit(
-		qu.ObjToString(util.Config.OssInfo["ossEndpoint"]),
-		qu.ObjToString(util.Config.OssInfo["ossAccessKeyId"]),
-		qu.ObjToString(util.Config.OssInfo["ossAccessKeySecret"]),
-		qu.ObjToString(util.Config.OssInfo["ossBucketName"]),
-	)
-	//udp
-	udp.InitUdp()
-}
-
-//
-func main() {
-	//定时查询任务发送邮件
-	//go tomail.SendToMail()
-	//定时任务
-	go tomail.TimeTask()
-	//提供接口,接收其他数据
-	http.HandleFunc("/spider/infos", func(w http.ResponseWriter, req *http.Request) {
-		data := req.FormValue("data")
-		types := req.FormValue("type")
-		if types == "info" {
-			front.SpiderInfo(data)
-		}
-		if types == "mtask" {
-			front.SpiderModifyTask(data)
-		}
-		if types == "code" {
-			front.SpiderMoveEvent(data)
-		}
-	})
-	go http.ListenAndServe(":6011", nil)
-	xweb.Run(":" + util.Config.Webport)
-}

+ 0 - 190
main_test.go

@@ -1,190 +0,0 @@
-// main_test
-package main
-
-import (
-	"log"
-	"luaweb/spider"
-	"luaweb/util"
-	mgdb "qfw/util/mongodb"
-	"testing"
-	"time"
-
-	"github.com/lauyoume/gopinyin"
-)
-
-//模板测试
-func Test_Tmp(t *testing.T) {
-	proficient := ""
-	//通用变量配置
-	common := []interface{}{
-		"upload_test", "中央采购网-上传测试", "测试脚本栏目", true, 1, 10, 30, "bidding", "utf8", 1, 4002,
-		"http://www.ccgp.gov.cn/zycg/zycgdt/index.htm",
-	}
-	//最新时间配置
-	ptime := []interface{}{
-		"yyyyMMddHHmm",
-		"http://www.ccgp.gov.cn/zycg/zycgdt/index.htm",
-		"ul li em:eq(0)",
-	}
-	//	proficient = `function getLastPublishTime()
-	//					local content = download("",{})
-	//					return lastpushtime
-	//				end`
-	log.Println(spider.GetLastPublishTime(common, ptime, proficient, 0))
-	//列表页配置
-	list := []interface{}{
-		"http://www.ccgp.gov.cn/zycg/zycgdt/index#pageno#.htm",
-		"'http://www.ccgp.gov.cn/zycg/zycgdt/index.htm','http://www.ccgp.gov.cn/zycg/zycgdt/index_1.htm'",
-		"ul#main_list_lt_list>li",
-		"a:eq(1):attr(href)",
-		"a:eq(1):attr(title)",
-		"em:eq(0)",
-		"yyyyMMddHHmm",
-	}
-	model := map[string]interface{}{}
-	model["type"] = "other"
-	model["area"] = "HA"
-	model["city"] = "郑州"
-	model["publishdept"] = "郑州市财政厅"
-	//	proficient = `function downloadAndParseListPage(pageno)
-	//				end`
-	log.Println(spider.GetPageList(common, list, model, proficient, 0))
-	content := []interface{}{
-		"div.TRS_Editor",
-		"div.TRS_Editor",
-	}
-	data := map[string]interface{}{}
-	data["title"] = "苏州市召开市级政府采购信用融资工作座谈会"
-	data["href"] = "http://www.zfcg.suzhou.gov.cn/html/content/20160729165741501.shtml"
-	data["publishtime"] = "2016-08-17 12:12:12"
-	//	proficient = `function downloadDetailPage(data)
-	//			end`
-	log.Println(spider.GetContentInfo(common, content, data, proficient, 0))
-}
-
-//保存更新爬虫
-func Test_saveSpider(t *testing.T) {
-	mgdb.InitMongodbPool(2, "192.168.3.18:27080", "luaweb")
-	param := map[string]interface{}{}
-	//通用变量配置
-	common := []interface{}{
-		"upload_test", "中央采购网-上传测试", "测试脚本栏目", true, 1, 10, 30, "bidding", "utf8", 1, 4002,
-		"http://www.ccgp.gov.cn/zycg/zycgdt/index.htm",
-	}
-	//最新时间配置
-	ptime := []interface{}{
-		"yyyyMMddHHmm",
-		"http://www.ccgp.gov.cn/zycg/zycgdt/",
-		"ul li em:eq(0)",
-	}
-	param["type_time"] = 0 //0向导模式 1专家模式
-
-	//列表页配置
-	list := []interface{}{
-		"http://www.ccgp.gov.cn/zycg/zycgdt/index#pageno#.htm",
-		"'http://www.ccgp.gov.cn/zycg/zycgdt/index.htm','http://www.ccgp.gov.cn/zycg/zycgdt/index_1.htm'",
-		"ul#main_list_lt_list li",
-		"a:eq(1):attr(href)",
-		"a:eq(1):attr(title)",
-		"em:eq(0)",
-		"yyyyMMddHHmm",
-	}
-	param["type_list"] = 0 //0向导模式 1专家模式
-
-	//三级页配置
-	content := []interface{}{
-		"div.TRS_Editor",
-		"div.TRS_Editor",
-	}
-	param["type_content"] = 0 //0向导模式 1专家模式
-
-	param["param_common"] = common
-	//向导模式
-	param["param_time"] = ptime
-	param["param_list"] = list
-	param["param_content"] = content
-	//专家模式
-	param["str_time"] = `function getLastPublishTime()
-							local content = download("href",{})
-							return lastpushtime
-						end`
-	param["str_list"] = `function downloadAndParseListPage(pageno)
-	 					end`
-	param["str_content"] = `function downloadDetailPage(data)
- 							end`
-
-	param["comeintime"] = time.Now().Unix()
-	param["model"] = map[string]interface{}{
-		"type":        "tender",
-		"area":        "HA",
-		"city":        "郑州",
-		"publishdept": "郑州市财政厅",
-	} //补充数据模型
-	param["createuser"] = "zjk" //姓名
-	param["upload"] = false     //是否上传
-	spider.SaveSpider("upload_test", param)
-}
-
-//生成lua文件测试
-func Test_createFile(t *testing.T) {
-	mgdb.InitMongodbPool(2, "192.168.3.18:27080", "luaweb")
-	scritp := spider.GetScript("upload_test")
-	if scritp != "" {
-		_, err := spider.CreateFile("upload_test", scritp)
-		log.Println(err)
-	}
-}
-
-//上传脚本
-func Test_uploadFile(t *testing.T) {
-	util.InitMsgClient(util.Config.Msgserveraddr, util.Config.Msgname)
-	mgdb.InitMongodbPool(2, "192.168.3.18:27080", "luaweb")
-	ret, err := spider.UpLoadScript("upload_test", 7001)
-	if err != nil {
-		log.Println("err", err)
-	} else {
-		log.Println("ret", ret)
-	}
-}
-
-//获取拼音首子母
-func Test_getFirstName(t *testing.T) {
-	str := gopinyin.Convert("HA_河南省政府采购网_招标公告", true)
-	log.Println(str)
-}
-
-func TestCheck(t *testing.T) {
-	steps := make([]bool, 3)
-	s := spider.CreateSpider(spider.GetScript("zgwlzbw_zbgg"))
-	s.SpiderMaxPage = 1
-	time, timeerr := s.GetLastPublishTime()
-	if timeerr != nil || len(time) < 5 {
-		steps[0] = false
-		return
-	} else {
-		list, listerr := s.DownListPageItem()
-		if listerr != nil || len(list) == 0 {
-			steps[0] = false
-		} else {
-			steps[0] = true
-			listone := list[0]
-			if len(listone["href"].(string)) < 7 || len(listone["publishtime"].(string)) < 5 || len(listone["title"].(string)) < 10 {
-				steps[1] = false
-			} else {
-				steps[1] = true
-				param := map[string]string{}
-				param["title"] = list[0]["title"].(string)
-				param["href"] = list[0]["href"].(string)
-				param["publishtime"] = list[0]["publishtime"].(string)
-				data := map[string]interface{}{}
-				s.DownloadDetailPage(param, data)
-				if len(data) == 0 || len(data["detail"].(string)) < 50 {
-					steps[2] = false
-				} else {
-					steps[2] = true
-				}
-			}
-		}
-	}
-
-}

+ 0 - 323
quesManager/quesManager.go

@@ -1,323 +0,0 @@
-package quesManager
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	qu "qfw/util"
-	mgdb "qfw/util/mongodb"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/go-xweb/xweb"
-	"github.com/tealeg/xlsx"
-	"gopkg.in/mgo.v2/bson"
-)
-
-type QuesM struct {
-	*xweb.Action
-	managerQues     xweb.Mapper `xweb:"/center/managerQues"`              //问题管理
-	saveNewQues     xweb.Mapper `xweb:"/center/question/saveNewQues"`     //新建问题
-	saveFeedbackSug xweb.Mapper `xweb:"/center/question/saveFeedbackSug"` //保存反馈意见
-	closeQues       xweb.Mapper `xweb:"/center/question/closeQues"`       //关闭问题
-	quesfile        xweb.Mapper `xweb:"/center/question/quesfile"`        //批量导入问题
-
-}
-
-const role_admin, role_examine, role_dev = 3, 2, 1 //管理员,审核员,开发员
-var REG = regexp.MustCompile(".*/(.+)\\.html.*")
-
-func (q *QuesM) ManagerQues() {
-	if q.Method() == "POST" {
-		start, _ := q.GetInteger("start")
-		limit, _ := q.GetInteger("length")
-		draw, _ := q.GetInteger("draw")
-		searchStr := q.GetString("search[value]") //搜索内容
-		search := strings.TrimSpace(searchStr)
-		state, _ := q.GetInteger("state")           //问题状态
-		introStage, _ := q.GetInteger("introStage") //引入阶段
-		//log.Println("start:", start, "	limit:", limit, "	draw:", draw, "	search:", search, "	state", state, "	introStage", introStage)
-		query := bson.M{}
-		if state >= 0 && introStage >= 0 { //同时满足问题状态和引入阶段
-			query = bson.M{
-				"i_state":      state,
-				"i_introStage": introStage,
-			}
-		} else if state < 0 && introStage >= 0 { //仅仅搜索满足引入阶段,不搜索问题状态
-			query = bson.M{
-				"i_introStage": introStage,
-			}
-		} else if state >= 0 && introStage < 0 { //仅仅搜索满足问题状态,不搜索引入阶段
-			query = bson.M{
-				"i_state": state,
-			}
-		}
-		if search != "" {
-			query["$or"] = []interface{}{
-				bson.M{"s_title": bson.M{"$regex": search}},
-				bson.M{"s_id": bson.M{"$regex": search}},
-				bson.M{"s_errFiled": bson.M{"$regex": search}},
-			}
-		}
-		sort := `{"%s":%d}`
-		orderIndex := q.GetString("order[0][column]")
-		orderName := q.GetString(fmt.Sprintf("columns[%s][data]", orderIndex))
-		orderType := 1
-		if q.GetString("order[0][dir]") != "asc" {
-			orderType = -1
-		}
-		sort = fmt.Sprintf(sort, orderName, orderType)
-		ques := *mgdb.Find("question", query, sort, nil, false, start, limit)
-		count := mgdb.Count("question", query)
-		page := start / 10
-		if ques != nil {
-			for k, v := range ques {
-				v["num"] = k + 1 + page*10
-				i_state := v["i_state"]
-				i_introStage := v["i_introStage"]
-				if i_state == 0 { //未处理
-					v["i_state"] = "未处理"
-				} else if i_state == 1 { //已处理
-					v["i_state"] = "已处理"
-				} else if i_state == 2 { //暂不处理
-					v["i_state"] = "暂不处理"
-				} else if i_state == 4 { //关闭
-					v["i_state"] = "关闭"
-				}
-				if i_introStage == 0 { //爬虫抓取阶段
-					v["i_introStage"] = "爬虫抓取"
-				} else if i_introStage == 1 { //数据抽取阶段
-					v["i_introStage"] = "数据抽取"
-				} else if i_introStage == 2 { //数据分类阶段
-					v["i_introStage"] = "数据分类"
-				}
-				v["i_time"] = time.Unix(v["i_time"].(int64), 0).Format("2006-01-02 15:04:05")
-			}
-		}
-		//log.Println("ques:", ques)
-		q.ServeJson(map[string]interface{}{"draw": draw, "data": ques, "recordsFiltered": count, "recordsTotal": count})
-	} else {
-		q.Render("question.html")
-	}
-}
-
-//新建问题
-func (q *QuesM) SaveNewQues() {
-	auth := qu.IntAll(q.GetSession("auth"))
-	if auth != role_admin {
-		q.ServeJson("没有权限")
-		return
-	}
-	title := q.GetString("info")
-	id := q.GetString("id")
-	addr := q.GetString("addr")
-	introStageStr := q.GetString("intro")
-	errFiled := q.GetString("errFiled")
-	name := q.GetString("name")
-	descript := q.GetString("descript")
-	if id == "" { //解析地址
-		id = getId(addr)
-	} else if addr == "" { //加密id
-		addr = getAddr(id)
-	}
-	log.Println("Save id:", id, "	addr:", addr)
-	if id == "" || addr == "" {
-		q.ServeJson(map[string]interface{}{
-			"state": "err",
-		})
-		return
-	}
-	newQues := make(map[string]interface{})
-	newQues["s_title"] = title //标题
-	newQues["s_id"] = id       //id
-	newQues["s_href"] = addr   //地址
-	introStage := -1
-	if introStageStr == "grab" {
-		introStage = 0
-	} else if introStageStr == "extract" {
-		introStage = 1
-	} else if introStageStr == "classify" {
-		introStage = 2
-	}
-	newQues["i_introStage"] = introStage  //引入阶段
-	newQues["s_errFiled"] = errFiled      //错误字段
-	newQues["s_feedbackPerson"] = name    //反馈人
-	newQues["s_descript"] = descript      //描述
-	newQues["i_time"] = time.Now().Unix() //录入时间
-	newQues["i_state"] = 0                //问题状态(新建默认为未处理)
-	newQues["s_sugesstion"] = ""          //意见反馈
-
-	//log.Println(title, id, addr, introStage, errFiled, name, descript, endTime)
-	s := mgdb.Save("question", newQues)
-	state := "err"
-	if len(s) > 0 {
-		state = "ok"
-	}
-	q.ServeJson(map[string]interface{}{
-		"state": state,
-	})
-}
-
-//保存反馈意见
-func (q *QuesM) SaveFeedbackSug() {
-	_id := q.GetString("feedbackId")
-	s_sugesstion := q.GetString("sug")
-	state := q.GetString("feedbackState")
-	i_state := -1
-	if state == "未处理" {
-		i_state = 0
-	} else if state == "已处理" {
-		i_state = 1
-	} else if state == "暂不处理" {
-		i_state = 2
-	}
-	query := bson.M{
-		"_id": bson.ObjectIdHex(_id),
-	}
-	update := bson.M{
-		"$set": bson.M{
-			"i_state":      i_state,
-			"s_sugesstion": s_sugesstion,
-		},
-	}
-	//	log.Println(_id, s_sugesstion, state, query, update)
-	b := mgdb.Update("question", query, update, false, false)
-	log.Println("Save:	", _id, "	反馈意见", b)
-	returnState := "false"
-	if b {
-		returnState = "ok"
-	}
-	q.ServeJson(map[string]interface{}{
-		"state": returnState,
-	})
-}
-
-//关闭问题
-func (q *QuesM) CloseQues() {
-	_id := q.GetString("id")
-	query := bson.M{
-		"_id": bson.ObjectIdHex(_id),
-	}
-	update := bson.M{
-		"$set": bson.M{
-			"i_state": 4,
-		},
-	}
-	b := mgdb.Update("question", query, update, false, false)
-	log.Println("Close :", _id, "	", b)
-	state := "false"
-	if b {
-		state = "ok"
-	}
-	q.ServeJson(map[string]interface{}{
-		"state": state,
-	})
-}
-
-//批量导入问题
-func (q *QuesM) Quesfile() {
-	auth := qu.IntAll(q.GetSession("auth"))
-	if auth != role_admin {
-		q.ServeJson("没有权限")
-		return
-	}
-
-	if q.Method() == "POST" {
-		mf, _, err := q.GetFile("xlsx")
-		errorinfo := map[string]interface{}{}
-		if err == nil {
-			binary, _ := ioutil.ReadAll(mf)
-			xls, _ := xlsx.OpenBinary(binary)
-			sheet := xls.Sheets[0]
-			rows := sheet.Rows
-			for rk, row := range rows {
-				if rk != 0 { //excel表中第一行为标题字段舍去
-					//log.Println(k, "	row----", row)
-					cells := row.Cells
-					if len(cells) != 7 {
-						errorinfo["data"+strconv.Itoa(rk)] = "第" + strconv.Itoa(rk+1) + "行数据填写不完整"
-						continue
-					}
-					addr := cells[1].Value //地址
-					id := cells[2].Value   //id
-					if addr == "" && id == "" {
-						errorinfo["data"+strconv.Itoa(rk)] = "第" + strconv.Itoa(rk+1) + "行问题页面和信息id不能同时为空"
-						continue
-					}
-					title := cells[0].Value          //标题
-					errField := cells[3].Value       //错误字段
-					descript := cells[4].Value       //问题描述
-					introStage := cells[5].Value     //引入阶段
-					feedbackPerson := cells[6].Value //反馈人
-					if errField == "" || descript == "" || introStage == "" {
-						errorinfo["data"+strconv.Itoa(rk)] = "第" + strconv.Itoa(rk+1) + "行数据填写不完整"
-						continue
-					}
-					errStr := arrangeData(title, id, addr, errField, descript, introStage, feedbackPerson)
-					if errStr != "" {
-						errorinfo["data"+strconv.Itoa(rk)] = "第" + strconv.Itoa(rk+1) + "行" + errStr
-					}
-					//log.Println(title, descript, introStage, feedbackPerson)
-				}
-			}
-
-			q.ServeJson(errorinfo)
-		} else {
-			q.ServeJson(false)
-		}
-	}
-}
-func arrangeData(title, id, addr, errField, descript, introStage, feedbackPerson string) string {
-	fileQues := make(map[string]interface{})
-	i_introStage := -1
-	if id == "" { //解析地址
-		id = getId(addr)
-	} else if addr == "" { //加密id
-		addr = getAddr(id)
-	}
-	if id == "" || addr == "" { //未解析成功
-		return "网址或id解析错误"
-	}
-
-	fileQues["s_title"] = title //标题
-	fileQues["s_id"] = id       //id
-	fileQues["s_href"] = addr   //地址
-	if introStage == "爬虫抓取阶段" {
-		i_introStage = 0
-	} else if introStage == "数据抽取阶段" {
-		i_introStage = 1
-	} else if introStage == "数据分类阶段" {
-		i_introStage = 2
-	}
-	fileQues["i_introStage"] = i_introStage       //引入阶段
-	fileQues["s_errFiled"] = errField             //错误字段
-	fileQues["s_feedbackPerson"] = feedbackPerson //反馈人
-	fileQues["s_descript"] = descript             //描述
-	fileQues["i_time"] = time.Now().Unix()        //录入时间
-	fileQues["i_state"] = 0                       //问题状态(新建默认为未处理)
-	fileQues["s_sugesstion"] = ""                 //意见反馈
-	mgdb.Save("question", fileQues)
-	return ""
-
-}
-
-//根据地址解析出id
-func getId(addr string) string {
-	ins := REG.ReplaceAllString(addr, "$1")
-	id := ""
-	if ins != "" {
-		res := qu.CommonDecodeArticle("content", ins)
-		if res != nil && len(res) > 0 {
-			id = res[0]
-		}
-	}
-	return id
-}
-
-//根据id加密
-func getAddr(id string) string {
-	addr := qu.EncodeArticleId2ByCheck(id)
-	return "https://www.jianyu360.com/article/content/" + addr + ".html"
-}

+ 0 - 113
res/spider_test.lua

@@ -1,113 +0,0 @@
---引用公用包
-local com=require "res.util.comm"
---名称
-spiderName="中央采购网-测试脚本";
---代码
-spiderCode="cn_cgw_test";
---是否下载3级页
-spiderDownDetailPage=true;
---开始下载页
-spiderStartPage=1;
---最大下载也
-spiderMaxPage=5;
---上次下载时间
-spiderLastDownloadTime="2015-01-01 01:10:01";
---执行频率30分钟
-spiderRunRate=10;
---下载内容写入表名
-spider2Collection="test111";
---下载页面时使用的编码
-spiderPageEncoding="utf8";
---是否使用代理
-spiderUserProxy=false;
---是否是安全协议
-spiderUserHttps=false;
---下载详细页线程数
-spiderThread=1
---存储模式 1 直接存储,2 调用消息总线 ...
-spiderStoreMode=1
-spiderStoreToMsgEvent=4002 --消息总线event
---判重字段 空默认不判重,spiderCoverAttr="title" 按title判重覆盖
-spiderCoverAttr="title"
---延时毫秒 基本延时(spiderSleepBase)+随机延时(spiderSleepRand)
-spiderSleepBase=1000
-spiderSleepRand=1000
-
---取得对方网站最后发布时间 必须返回yyyy-MM-dd HH:mm:ss 格式
-function getLastPublishTime()
-	--transCode("unicode","内容")--转码,支持unicode,urlcode,decode64
-	--timeSleep(5)--延时 
-	--changeDownloader()--指定下载点
-	local content = download("http://www.ccgp.gov.cn/zycg/zycgdt/",{})
-	local tmp = findOneText("ul>li>em:eq(0)",content)
-	local lastpushtime=com.parseDate(tmp,"yyyyMMddHHmm")
-	print("lastpushtime:"..lastpushtime);
-	return lastpushtime
-end
-
---下载分析列表页
-function downloadAndParseListPage(pageno)
-	local page={}		
-	local href=""
-	if pageno==1 then
-	href="http://www.ccgp.gov.cn/zycg/zycgdt/index.htm"
-	else
-	href="http://www.ccgp.gov.cn/zycg/zycgdt/index_"..tostring(pageno-1)..".htm"
-	end
-	--print("href:"..href)
-	local content = download(href,{})
-	local list = findListHtml("ul#main_list_lt_list>li",content)
-	--print("list:"..content.."content")
-	--根据实际情况:验证下载列表内容是否正确
-	if table.getn(list)<1 then
-		return downloadAndParseListPage(pageno)
-	end
-	for k, v in pairs(list) do
-		--分析列表,可加入自己分析列表是,需要的其他字段,最终会存储到新闻上	
-		item={}
-		item["href"]="a:eq(1):attr(href)"
-		item["title"]="a:eq(1):attr(title)"
-		item["publishtime"]="em:eq(0)"
-		item["department"]="a:eq(0):attr(title)"
-		item=findMap(item,v)
-		item["publishtime"]=com.parseDate(item["publishtime"],"yyyyMMddHHmm")
-		item["href"]="http://www.ccgp.gov.cn/zycg/zycgdt/"..item["href"]
-		page[k]=item
-	end
-	return page
-end
-
---下载三级页,分析三级页
-function downloadDetailPage(data)
-	for i=1,5 do 	--5次下载任务不成功,退出
-		local content = download(data["href"],{})
-		--print("content",content)
-		local ret={
-			["sitename"]="标网",
-			["channel"]="招标公告",
-			["href"]=data["href"],
-			["title"]=findOneText("div.vT_detail_header h2",content),
-			["detail"]=findOneText("div.TRS_Editor",content),
-			["contenthtml"]=findOneHtml("div.TRS_Editor",content),
-			["publishtime"]=data["publishtime"],
-			["l_np_publishtime"]=com.strToTimestamp(data["publishtime"]),
-			["_d"]="comeintime"
-		}
-		
-		local checkAttr={"title","href","publishtime","detail","contenthtml"}
-		local b,err=com.checkData(checkAttr,ret)
-		print(ret.href,ret.title,ret.publishtime)
-		--os.exit()
-		if b then
-			return ret
-		else
-			--print("第",i,"次下载失败")
-			timeSleep(60)--延时60秒再次请求
-			if i==5 then
-				saveErrLog(spiderCode,spiderName,ret["href"],err)
-			end
-		end
-	end
-end
---保存错误日志
---saveErrLog(spiderCode,spiderName,出错url,出错原因)

+ 0 - 751
res/util/comm.lua

@@ -1,751 +0,0 @@
---[[
-企明星爬虫系统,公共文件
-Author:a7
-Date:2016/4/7
-]]
-local json=require "json"
-common={}
-
---Lua的Eval函数
-function common.eval(script)
-	script=common.clearJson(script)
-	local tmp = "return "..script;
-	local s = loadstring(tmp);
-	if s==nil then
-		return nil
-	end
-	return s()
-end
-
---输出
-function printf(obj)
-	print(dump(obj) )
-end
-
-function dump(obj)  
-    local getIndent, quoteStr, wrapKey, wrapVal, isArray, dumpObj  
-    getIndent = function(level)  
-        return string.rep("\t", level)  
-    end  
-    quoteStr = function(str)  
-        str = string.gsub(str, "[%c\\\"]", {  
-            ["\t"] = "\\t",  
-            ["\r"] = "\\r",  
-            ["\n"] = "\\n",  
-            ["\""] = "\\\"",  
-            ["\\"] = "\\\\",  
-        })  
-        return '"' .. str .. '"'  
-    end  
-    wrapKey = function(val)  
-        if type(val) == "number" then  
-            return "[" .. val .. "]"  
-        elseif type(val) == "string" then  
-            return "[" .. quoteStr(val) .. "]"  
-        else  
-            return "[" .. tostring(val) .. "]"  
-        end  
-    end  
-    wrapVal = function(val, level)  
-        if type(val) == "table" then  
-            return dumpObj(val, level)  
-        elseif type(val) == "number" then  
-            return val  
-        elseif type(val) == "string" then  
-            return quoteStr(val)  
-        else  
-            return tostring(val)  
-        end  
-    end  
-    local isArray = function(arr)  
-        local count = 0   
-        for k, v in pairs(arr) do  
-            count = count + 1   
-        end   
-        for i = 1, count do  
-            if arr[i] == nil then  
-                return false  
-            end   
-        end   
-        return true, count  
-    end  
-    dumpObj = function(obj, level)  
-        if type(obj) ~= "table" then  
-            return wrapVal(obj)  
-        end  
-        level = level + 1  
-        local tokens = {}  
-        tokens[#tokens + 1] = "{"  
-        local ret, count = isArray(obj)  
-        if ret then  
-            for i = 1, count do  
-                tokens[#tokens + 1] = getIndent(level) .. wrapVal(obj[i], level) .. ","  
-            end  
-        else  
-            for k, v in pairs(obj) do  
-                tokens[#tokens + 1] = getIndent(level) .. wrapKey(k) .. " = " .. wrapVal(v, level) .. ","  
-            end  
-        end  
-        tokens[#tokens + 1] = getIndent(level - 1) .. "}"  
-        return table.concat(tokens, "\n")  
-    end  
-    return dumpObj(obj, 0)  
-end  
-
---JSON数据清理
-function common.clearJson(json)
-	--中括号替换
-	json=string.gsub(json,"%[","{")
-	json=string.gsub(json,"%]","}")
-	--键的引号及冒号替换
-	json=string.gsub(json,"\"([^\"]*)\":","%1=")
-	return json
-end
--- 替换转义字符
-function common.replaceEscString(c)
-      c=string.gsub(c,"&lt;","<")
-      c=string.gsub(c,"&gt;",">")
-      c=string.gsub(c,"&quot;","'")
-      c=string.gsub(c,"&amp;","&")
-      c=string.gsub(c,"&#34;","\"")
-      return c
-end
-
---返回通用当前日期时间
-function common.nowDate()
-	return os.date("%Y-%m-%d %H:%M:%S", os.time())
-end
---返回通用日期格式
-
-monthmap={["Jan"]="01",["Feb"]="02",["Mar"]="03",["Apr"]="04",["May"]="05",["June"]="06",["Jun"]="06",["July"]="07",["Jul"]="07",["Aug"]="08",["Sept"]="09",["Sep"]="09",["Oct"]="10",["Nov"]="11",["Dec"]="12"}
--- 处理格林威治时间
-function common.timeStrByCST(strtime)
-	local st=common.split(strtime," ")
-	return st[6].."-"..monthmap[st[2]].."-"..st[3].." "..st[4]
-end
-
-
---日期解析
-function common.parseDate(datestr,datetype)
-	if datestr == nil then
-		return "0"
-	end
-	local tmp = {}
-	local pos=0
-	for i in string.gmatch(datestr,"(%d+)")  do
-		tmp[pos]=i
-		pos=pos+1
-	end
-	if table.getn(tmp) == 0 then
-		return "0"
-		--return os.date("%Y-%m-%d %H:%M:%S", os.time())
-	end
-	--判断日期值是否有误
-	if tmp[0]==nil or tmp[1]==nil then
-		return "0"
-	end
-	--月日
-	if datetype=="MMdd" then 
-		return tostring(os.date("%Y",os.time())).."-"..common.padDigital(tmp[0]).."-"..common.padDigital(tmp[1]).." 00:00:00"
-	end
-	if tmp[2] ~=nil then
-		--传入的格式是:年月日(中间可以有任意分隔符)
-		if datetype=="yyyyMMdd" then
-			return tmp[0].."-"..common.padDigital(tmp[1]).."-"..common.padDigital(tmp[2]).. os.date(" %H:%M:%S", os.time())
-		end
-		if tmp[3] ~=nil and tmp[4] ~=nil then
-			--年月日时分
-			if datetype=="yyyyMMddHHmm" then
-				return tmp[0].."-"..common.padDigital(tmp[1]).."-"..common.padDigital(tmp[2]).." "..common.padDigital(tmp[3])..":"..tmp[4]..":00"
-			end
-			if tmp[5] ~=nil then
-				--年月日时分秒
-				if datetype=="yyyyMMddHHmmss" then
-					return tmp[0].."-"..common.padDigital(tmp[1]).."-"..common.padDigital(tmp[2]).." "..common.padDigital(tmp[3])..":"..tmp[4]..":"..tmp[5]
-				end
-			end
-		end
-	end
-	return "0"
---	if datetype=="yyyyMMdd" then
---		return tmp[0].."-"..common.padDigital(tmp[1]).."-"..common.padDigital(tmp[2]).. os.date(" %H:%M:%S", os.time())
---	--年月日时分秒
---	elseif datetype=="yyyyMMddHHmmss" then
---		return tmp[0].."-"..common.padDigital(tmp[1]).."-"..common.padDigital(tmp[2]).." "..common.padDigital(tmp[3])..":"..tmp[4]..":"..tmp[5]
---	--年月日时分
---	elseif datetype=="yyyyMMddHHmm" then 
---		return tmp[0].."-"..common.padDigital(tmp[1]).."-"..common.padDigital(tmp[2]).." "..common.padDigital(tmp[3])..":"..tmp[4]..":00"
---	--月日	
---	elseif datetype=="MMdd" then 
---		return tostring(os.date("%Y",os.time())).."-"..common.padDigital(tmp[0]).."-"..common.padDigital(tmp[1]).." 00:00:00"
---	else 
---	    return "0"
---	end
-end
-
---日期补全
-function common.padDigital(src)
-	if string.len(src)<2 then
-		return "0"..src
-	else
-		return src
-	end
-end
---local datestr="2016年05月12日22:05:04"
---print(parseDate(datestr,"yyyyMMddHHmm"))
---print(parseDate("4月5日","MMdd"))
-
---字符日期转时间戳  原始时间字符串,要求格式yyyy-MM-dd HH:mm:ss,
-function common.strToTimestamp(str)  
-    --从日期字符串中截取出年月日时分秒  
-	if string.len(str)<19 then
-	      return 0
-	  --    	return os.time()
-	end
-    local Y = tonumber(string.sub(str,1,4))
-    local M = tonumber(string.sub(str,6,7)) 
-    local D = tonumber(string.sub(str,9,10))  
-    local H = tonumber(string.sub(str,12,13))  
-    local MM = tonumber(string.sub(str,15,16))  
-    local SS = tonumber(string.sub(str,18,19))  
- 	return os.time{year=Y, month=M, day=D, hour=H,min=MM,sec=SS} 
-end  
-
-function common.trim(s) 
-	if s == nil then
-		return ""
-	end
-	return string.gsub(s, "[\r|\n| |\t]+", "")
-end   
-
---分割字符串
-function common.split(str, delimiter)
-    local result = {}
-	if str==nil or str=='' or delimiter==nil then
-		return result
-	end
-	
-    for match in (str..delimiter):gmatch("(.-)"..delimiter) do
-        table.insert(result, match)
-    end
-    return result
-end
-
---正则匹配返回值修正
-function common.regTab(con,reg)
-	local tab=string.match(con,reg)
-	if tab==nil then
-		return ""
-	else
-		return tab
-	end
-end
-
---只验证属性字段不为空 tab1属性字段,tab2待验证对象
-function common.checkData(tab1,tab2)
-	local b=true
-	local str=""
-	for _,v in pairs(tab1) do
-		if tab2[v]==nil or tab2[v]=="" then
-			str=str..v..":值空"..","
-			b=false
-		end
-	end
-	return  b,str
-end
-
---URL编码
-function common.decodeURI(s)
-	if s == nil then
-		return ""
-	end
-    s = string.gsub(s, '%%(%x%x)', function(h) return string.char(tonumber(h, 16)) end)
-    return s
-end
-
-function common.encodeURI(s)
-	if s == nil then
-		return ""
-	end
-    s = string.gsub(s, "([^%w%.%- ])", function(c) return string.format("%%%02X", string.byte(c)) end)
-    return string.gsub(s, " ", "+")
-end
-
-
-function common.gethref(channel,href)
-	local prehttp=string.sub(channel,1,5)
-	if string.lower(prehttp)=="https" then
-		prehttp="https://"
-	else
-		prehttp="http://"
-	end
-	local pre=string.sub(href,1,4)
-	if string.lower(pre)=="http" then
-		return href
-	else 
-		-- channel=string.sub(channel,8)
-		channel=channel:match("https?://(.*)$")
-		local channelpath=common.split(channel,"/")
-
-		pre=string.sub(href,1,1)
-		if pre~="." and  pre~="/" then
-			href = "./"..href
-		end
-		pre=string.sub(href,1,2)
-		if pre==".." then
-			local infopath=common.split(href,"%./")
-			for i=1,table.getn(infopath) do
-				if table.getn(channelpath)==1 then
-					break
-				end
-		 		table.remove(channelpath,-1) 
-		 	end
-			tmp=""
-		 	for i=1,table.getn(channelpath) do
-		 		tmp=tmp..channelpath[i].."/"
-		 	end
-			local infourl = infopath[table.getn(infopath)]
-		 	href=prehttp..tmp..string.sub(infourl,0,string.len(infourl)-1)
-		else
-			if pre=="./" then
-			 	table.remove(channelpath,-1) 
-				tmp=prehttp
-			 	for i=1,table.getn(channelpath) do
-			 		tmp=tmp..channelpath[i].."/"
-			 	end
-				href=tmp..string.sub(href,3)
-			else
-				if string.sub(href,0,1)=="/" then
-					href=prehttp..channelpath[1]..href
-				else
-					href=prehttp..channelpath[1].."/"..href
-				end
-			end
-		end
-		return href
-	end
-end
-
-function common.splitf(str, delimiter)
-	if str==nil or str=='' or delimiter==nil then
-		return nil
-	end
-	
-    local result = {}
-    for match in (str..delimiter):gmatch("(.-)"..delimiter) do
-        table.insert(result, match)
-    end
-    return result
-end
-
-
-function common.checkUpdate(content,update)
-	if update == "" or update == nil then
-		return 0
-	end
-	local updates=common.splitf(update,"\n")
-  	local out=1
-    for _,v in pairs(updates) do
-   		local vs=common.splitf(v,"==")
-   		if table.getn(vs)>1 then
-   			local item={}
-   			item["tmp"]=vs[1];
-   			local tmp=findMap(item,content)["tmp"]
-   			if tmp~=vs[2] then
-     			out=-1
-   			end
-   		end
-	end
-	
-	if out==-1 then
-		return -1
-	else
-		return 0
-	end
-end
-
---获取附件标题
-function common.getEnclosureTitle(href,content)
-	local fileTitles = {}
-	
-	local linkList = findListHtml("a", content)
-
-	for k,v in pairs(linkList) do 
-		local tempJpg1 = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.jpg$")
-		local tempJpg2 = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.JPG$")
-		local tempBid = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.bid$")
-		local tempPdf = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.pdf$")
-		local tempDoc = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.doc$")
-		local tempDocx = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.docx$")
-		local tempXls = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.xls$")
-		local tempXlsx = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.xlsx$")
-		local tempZip = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.zip$")
-		local tempRar = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.rar$")
-
-		if tempPdf ~= nil or tempDoc ~= nil or tempDocx ~= nil or tempXls ~= nil or tempXlsx ~= nil or tempZip ~= nil or tempRar ~= nil or tempJpg1 ~= nil or tempJpg2 ~= nil or tempBid ~= nil then
-			local tempTitle = findOneText("a:eq("..tostring(k-1)..")", content)
-			fileTitles[k] = tempTitle
-			--table.insert(fileTitles, tempTitle)
-		end
-	end
-
-	return fileTitles
-end
-
---获取附件链接
-function common.getEnclosureHref(href,content)
-	local hrefs = {}
-	
-	--href = common.gethref(href, "")
-	local linkList = findListHtml("a", content)
-
-	for k,v in pairs(linkList) do 
-		local tempJpg1 = string.find(v, "%.jpg$")
-		local tempJpg2 = string.find(v, "%.JPG$")
-		local tempBid = string.find(v, "%.bid$")
-		local tempPdf = string.find(v, "%.pdf$")
-		local tempDoc = string.find(v, "%.doc$")
-		local tempDocx = string.find(v, "%.docx$")
-		local tempXls = string.find(v, "%.xls$")
-		local tempXlsx = string.find(v, "%.xlsx$")
-		local tempZip = string.find(v, "%.zip$")
-		local tempRar = string.find(v, "%.rar$")
-
-		if tempPdf ~= nil or tempDoc ~= nil or tempDocx ~= nil or tempXls ~= nil or tempXlsx ~= nil or tempZip ~= nil or tempRar ~= nil or tempJpg1 ~= nil or tempJpg2 ~= nil or tempBid ~= nil then
-			local tempHref = findOneText("a:eq("..tostring(k-1).."):attr(href)", content)
-			local isWholeHref = string.find(tempHref, "http")
-			if isWholeHref == nil then
-				tempHref = common.gethref(href, tempHref)
-				--tempHref = href..tempHref
-			end
-			tempHref = string.gsub(tempHref, "\\", "/")
-			hrefs[k] = tempHref
-			--table.insert(hrefs, tempHref)
-		end
-	end
-	return hrefs
-end
-
---获取附件链接2
-function common.getEnclosureHrefByList(href,content)
-	local hrefs = {}
-	
-	--href = common.gethref(href, "")
-	local linkList = findListHtml("a", content)
-
-	for k,v in pairs(linkList) do 
-		local tempJpg1 = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.jpg$")
-		local tempJpg2 = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.JPG$")
-		local tempBid = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.bid$")
-		local tempPdf = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.pdf$")
-		local tempDoc = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.doc$")
-		local tempDocx = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.docx$")
-		local tempXls = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.xls$")
-		local tempXlsx = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.xlsx$")
-		local tempZip = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.zip$")
-		local tempRar = string.find(findOneText("a:eq("..tostring(k-1).."):attr(href)", content), "%.rar$")
-
-		if tempPdf ~= nil or tempDoc ~= nil or tempDocx ~= nil or tempXls ~= nil or tempXlsx ~= nil or tempZip ~= nil or tempRar ~= nil or tempJpg1 ~= nil or tempJpg2 ~= nil or tempBid ~= nil then
-			local tempHref = findOneText("a:eq("..tostring(k-1).."):attr(href)", content)
-			local isWholeHref = string.find(tempHref, "http")
-			if isWholeHref == nil then
-				tempHref = common.gethref(href, tempHref)
-				--tempHref = href..tempHref
-			end
-			tempHref = string.gsub(tempHref, "\\", "/")
-			hrefs[k] = tempHref
-			--table.insert(hrefs, tempHref)
-		end
-	end
-	return hrefs
-end
-
-
---下载多个附件
-function common.getFileAttachmentsArray(fileNameArray,fileLinkArray)
-	local attachments = {}
-	for i,fileLink in pairs(fileLinkArray) do
-		local url,name,size,ftype,fid=downloadFile(fileNameArray[i], fileLink, "get",{},{},"")
-		local u=1
-		while url=="" and u<6 do
-			url,name,size,ftype,fid=downloadFile(fileNameArray[i],fileLink,"get",{},{},"")
-			u=u+1
-			if u==6 and url=="" then
-				saveErrLog(fileLink,"comm附件下载失败")
-			end
-		end
-		if url~=nil and url~="" and name~=nil and name~="" then
-			local file = {}
-			file = {
-				["url"]=url,
-				["filename"]=name,
-				["size"]=size,
-				["ftype"]=ftype,
-				["fid"]=fid
-			}
-			table.insert(attachments, file)
-		end
-	end
-	return attachments
-end
-
---多附件下载,跳过获取href和title集合阶段
-function common.getFileAttachmentsArrayByHrefAndContent(href,content)
-	local fileTitles = common.getEnclosureTitle(href, content)
-	local fileLinks = common.getEnclosureHrefByList(href, content)
-	if table.getn(fileLinks) == 0 then
-		fileLinks = common.getEnclosureHref(href, content)
-	end
-	for i,v in ipairs(fileTitles) do
-		if v == "" then
-			table.remove(fileTitles, i)
-			table.remove(fileLinks, i)
-		end
-	end
-	local attachments = common.getFileAttachmentsArray(fileTitles, fileLinks)
-
-	return attachments
-end
-
-
---确定模块的附件下载方法(获取title与href)
---tags:模块选择器
---withend:是否以文件类型为后缀,比如 .doc,true为后缀,false不为后缀
-filetype={"jpg","JPG","bid","pdf","png","PDF","docx","doc","xlsx","xls","zip","rar","swf","DOCX","DOC","PDF","XLSX","XLS","ZIP","RAR","SWF"}	 
-function common.getFilesLinkByTag(href,tags,content,withend)
-	local dhtml = findOneHtml(tags, content)
-	--dhtml=dhtml.."<a href='/123.doc'>123.doc</a>"
-	local alist = findListHtml(tags.." a", content)
-	local flist={}
-	for k,v in pairs(alist) do
-		local item={}
-		item["href"]="a:eq("..tostring(k-1).."):attr(href)"
-		item["title"]="a:eq("..tostring(k-1)..")"
-		item=findMap(item,dhtml)
-		item["title"]=common.trim(tostring(item["title"]))
-		item["href"]=common.gethref(href,tostring(item["href"]))
-		item["href"] = string.gsub(item["href"], "\\", "/")
-		local isWholeHref = string.find(item["href"], "http")
-		if isWholeHref == nil then
-			item["href"] = transCode("utf8",item["href"])
-		end
-		local statehref;
-		for _,ftype in pairs(filetype) do
-			if withend then
-				statehref=string.find(item["href"], "%."..ftype.."$")
-				if statehref==nil or statehref=="" then
-					statehref=string.find(item["title"], "%."..ftype.."$")
-				end
-				item["ftype"]="%."..ftype
-			else
-				statehref=string.find(item["href"], "%."..ftype)
-				if statehref==nil or statehref=="" then
-					statehref=string.find(item["title"], "%."..ftype)
-				end
-				item["ftype"]="%."..ftype
-			end
-			if statehref then
-				break
-			end
-		end
-	
-		if statehref~=nil and item["title"]~="" then
-			
-			table.insert(flist,item)
-		end
-	end
-	return flist
-end
-
---确定模块的附件下载方法,封装
-function common.getFileAttachmentsArrayWithTag(href,tags,content,withend,param,head,ck)
-	if param == nil or head == nil  then
-		param={}
-		head={}
-		ck=""
-	end
-	local attachments = {}
-	--local nameTypeArr={"jpg","JPG","bid","pdf","PDF","doc","docx","xls","xlsx","zip","rar","swf","DOCX","DOC","PDF","XLS","XLSX","ZIP","RAR","SWF"}
-	local titleAndHrefList = common.getFilesLinkByTag(href,tags,content,withend)
-	for i,v in ipairs(titleAndHrefList) do
-		
-		local end_type = string.find(v["title"],v["ftype"].."$")
-		local file_name = ""
-		if end_type==nil or end_type=="" then
-			file_name = string.match(v["title"],"(.+"..v["ftype"]..")")
-		else
-			file_name = v["title"]
-		end
-		local url,name,size,ftype,fid=downloadFile(file_name, v["href"], "get",param,head,ck)
-		-- 附件原地址(默认为空)
-		local init_url = v["href"]
-		if url == "" then
-			local u = 0
-			while u < 2 do
-				u = u + 1
-				url,name,size,ftype,fid=downloadFile(file_name,v["href"],"get",param,head,ck)
-				if url ~= "" and size ~= "" then
-					u = 3   -- 下载无误 跳出循环
-				end
-				if u==2 and (url == "" or size == "") then
-					saveErrLog(v["href"],"comm附件下载失败")
-				end
-			end
-		end
-		
-		if url == "" and size == "" then
-			name = file_name
-		end
-
-		if type(url) ~= "string" then
-			url = ""
-		end
-		
-		-- 下载成功, 正常返回
-		if url~=nil and url~="" and name~=nil and name~="" and size ~= "" then
-			local file = {}
-			file = {
-				["url"]=url,
-				["filename"]=name,
-				["size"]=size,
-				["ftype"]=ftype,
-				["fid"]=fid,
-				["org_url"] = init_url
-			}
-			table.insert(attachments, file)
-			-- 下载失败
-		else 
-			local file = {}
-			file = {
-			    ["filename"]=name,
-				["org_url"] = init_url
-			}
-			table.insert(attachments, file)
-		end
-	end
-	return attachments
-end
-
-
-function common.getPureContent(content)
-	local startChar
-	local _,endChar
-	local resContent = content
-	while string.find(resContent, "<!%-%-")~=nil do
-		startChar,_ = string.find(resContent, "<!%-%-")
-		_,endChar = string.find(resContent, "%-%->")
-		resContent = string.sub(resContent, 1, startChar-1)..string.sub(resContent, endChar+1, string.len(resContent))
-	end
-	return resContent
-end
-
-
-function common.getMoneyAndType(orgStr)
-	orgStr = common.trim(orgStr)
-	orgStr = string.gsub(orgStr, "(", "")
-	orgStr = string.gsub(orgStr, ")", "")
-	orgStr = string.gsub(orgStr, ",", "")
-	local moneyType = ""
-	local num =0
-	local resNum =0
-	if string.find(orgStr, "万") ~= nil then
-		orgStr = string.gsub(orgStr, "万元", "")
-		orgStr = string.gsub(orgStr, "万", "")
-		if string.find(orgStr, "人民币") ~= nil then
-			orgStr = string.gsub(orgStr, "人民币", "")
-			orgStr = string.gsub(orgStr, "¥", "")
-			orgStr = string.gsub(orgStr, "¥", "")
-			moneyType = "人民币"
-		elseif string.find(orgStr, "美元") ~= nil then
-			orgStr = string.gsub(orgStr, "美元", "")
-			orgStr = string.gsub(orgStr, "$", "")
-			moneyType = "美元"
-		else
-			moneyType = "人民币"
-		end
-		local i, j = string.find(orgStr, "[0-9]+%.*[0-9]*")
-      	orgStr=string.sub(orgStr, i, j)
-		num = tonumber(orgStr)
-		num = num*10000
-	else
-	    if string.find(orgStr, "人民币") ~= nil then
-			orgStr = string.gsub(orgStr, "人民币", "")
-			orgStr = string.gsub(orgStr, "¥", "")
-			orgStr = string.gsub(orgStr, "¥", "")
-			moneyType = "人民币"
-		elseif string.find(orgStr, "美元") ~= nil then
-			orgStr = string.gsub(orgStr, "美元", "")
-			orgStr = string.gsub(orgStr, "$", "")
-			moneyType = "美元"
-		else
-			moneyType = "人民币"
-		end
-		local i, j = string.find(orgStr, "[0-9]+%.*[0-9]*")
-      	orgStr=string.sub(orgStr, i, j)
-		num = tonumber(orgStr)
-
-	end
-
-	local fmt = '%.' .. 2 .. 'f'
-    local resNum = tonumber(string.format(fmt, num))
-
-    return resNum, moneyType
-end
-
-
-function common.dataNil(data)
-	local nameNilArr={"jsondata","href","title","publishtime","detail","contenthtml"}
-	for _,name in pairs(nameNilArr) do
-		if data[name] == nil then
-			data[name] = ""
-			if name == "jsondata" then
-				data[name] = "{}"			
-			end
-		elseif name == "jsondata" and type(data[name]) == "table" then
-			local length = 0
-			for key, value in pairs(data[name]) do      
-			    length = length + 1 
-			end
-			if length > 0 then
-				data[name] = json.encode(data[name])
-			else
-				data[name] = "{}" 
-			end  
-		end
-	end
-	return data
-end
-
---判断三级页是否跳到其他网站
-function common.hrefInThisWeb(href,itemHref)
-	itemHref = common.gethref(href,itemHref)--标准化href
-	if itemHref == "" or itemHref == nil then
-		return "", false
-	end
-	--https开头
-	local httpsindex  = string.find(itemHref,"https")
-	if httpsindex == 1 then
-		return itemHref, common.isThisWeb(href,itemHref,9)
-	end
-	--http开头
-	local httpindex  = string.find(itemHref,"http")
-	if httpindex == 1 then
-		return  itemHref, common.isThisWeb(href,itemHref,8)
-	end
-	return itemHref, false
-end
-
-function common.isThisWeb(href,itemHref,i)
-	itemHref = string.sub(itemHref,i,string.len(itemHref))	--取http://后边的内容
-	domainame = common.split(itemHref,"/")[1] --截取域名
-	if domainame ~= nil and domainame ~= "" then
-		index = string.find(href,domainame)
-		if index ~= nil and index >= 1 then
-			return true
-		end
-	end
-	return false
-end
-
---通用方法结束
-return common;

+ 0 - 79
res/util/ecps.lua

@@ -1,79 +0,0 @@
---[[
-企明星爬虫系统,公共文件
-Author:zjk
-Date:2016/4/19
-]]
-
-ecps={}
---键值反转table
-function ecps.reversalFormat(tab,frtab,totab)
-	local tmpfrtab={}
-	for k,v in pairs(frtab) do
-		for k2,v2 in pairs(tab) do
-			if string.match(k,k2)~=nil and string.match(k,k2)~="" then
-				tmpfrtab[k]=tab[k2]
-				break
-			end	
-		end
-	end
-	local tmptotab={}
-	for k,v in pairs(totab) do
-		tmptotab[k]=tmpfrtab[v]
-		if k==tmpfrtab[v] then
-			tmptotab[k]=""
-		end
-	end
-	return tmptotab
-end
-
---企业基本信息表单 
-ecps.baseFm={
-	["统一社会信用代码/注册号/统一社会信用代码"]="RegNo",["名称"]="EntName",["类型"]="EntTypeName",
-	["注册资本/成员出资总额"]="RegCap",
-	["法定代表人/负责人/经营者/投资人/执行事务合伙人/执行事务合伙人(委派代表)"]="LeRep", 
-	["成立日期/注册日期"]="EstDate",
-	["核准日期/发照日期/吊销日期"]="IssBLicDate",
-	["营业期限自/经营期限自/合伙期限自"]="OpFrom",
-	["营业期限至/经营期限至/合伙期限至"]="OpTo",
-	["住所"]="Dom",["经营场所/主要经营场所/营业场所"]="OpLoc",
-	["经营范围/业务范围"]="OpScope",
-	["登记机关"]="RegOrg",["登记状态"]="OpState",
-} 
-ecps.baseMap={
-	["RegNo"]="统一社会信用代码/注册号/统一社会信用代码",["EntName"]="名称",["EntTypeName"]="类型",
-	["RegCap"]="注册资本/成员出资总额",
-	["LeRep"]="法定代表人/负责人/经营者/投资人/执行事务合伙人/执行事务合伙人(委派代表)",
-	["EstDate"]="成立日期/注册日期",
-	["IssBLicDate"]="核准日期/发照日期/吊销日期",
-	["OpFrom"]="营业期限自/经营期限自/合伙期限自",
-	["OpTo"]="营业期限至/经营期限至/合伙期限至",
-	["Dom"]="住所",["OpLoc"]="经营场所/主要经营场所/营业场所",
-	["OpScope"]="经营范围/业务范围",
-	["RegOrg"]="登记机关",["OpState"]="登记状态",
-}
-ecps.baseNbFm={
-	["统一社会信用代码/注册号/统一社会信用代码"]="RegNo",
-	["企业名称"]="EntName",["企业联系电话"]="Tel",["邮政编码"]="postcode",
-	["企业通信地址"]="address",["电子邮箱"]="email",
-	["有限责任公司本年度是否发生股东股权转让"]="equityTransfer",
-	["企业经营状态"]="state", 
-	["是否有网站或网店"]="hasWebsite",
-	["企业是否有投资信息或购买其他公司股权"]="hasInv",
-	["是否有对外担保信息"]="hasGuarantee",
-	["从业人数"]="numPeople",
-} 
-ecps.baseNbMap={
-	["RegNo"]="统一社会信用代码/注册号/统一社会信用代码",
-	["EntName"]="企业名称",["Tel"]="企业联系电话",["postcode"]="邮政编码",
-	["address"]="企业通信地址",["email"]="电子邮箱",
-	["equityTransfer"]="有限责任公司本年度是否发生股东股权转让",
-	["state"]="企业经营状态",
-	["hasWebsite"]="是否有网站或网店",
-	["hasInv"]="企业是否有投资信息或购买其他公司股权",
-	["hasGuarantee"]="是否有对外担保信息",
-	["numPeople"]="从业人数",
-} 
---通用方法结束
-return ecps;
-
-

+ 0 - 417
res/util/json.lua

@@ -1,417 +0,0 @@
------------------------------------------------------------------------------
--- JSON4Lua: JSON encoding / decoding support for the Lua language.
--- json Module.
--- Author: Craig Mason-Jones
--- Homepage: http://github.com/craigmj/json4lua/
--- Version: 1.0.0
--- This module is released under the MIT License (MIT).
--- Please see LICENCE.txt for details.
---
--- USAGE:
--- This module exposes two functions:
---   json.encode(o)
---     Returns the table / string / boolean / number / nil / json.null value as a JSON-encoded string.
---   json.decode(json_string)
---     Returns a Lua object populated with the data encoded in the JSON string json_string.
---
--- REQUIREMENTS:
---   compat-5.1 if using Lua 5.0
---
--- CHANGELOG
---   0.9.20 Introduction of local Lua functions for private functions (removed _ function prefix). 
---          Fixed Lua 5.1 compatibility issues.
---      Introduced json.null to have null values in associative arrays.
---          json.encode() performance improvement (more than 50%) through table.concat rather than ..
---          Introduced decode ability to ignore /**/ comments in the JSON string.
---   0.9.10 Fix to array encoding / decoding to correctly manage nil/null values in arrays.
------------------------------------------------------------------------------
-
------------------------------------------------------------------------------
--- Imports and dependencies
------------------------------------------------------------------------------
-local math = require('math')
-local string = require("string")
-local table = require("table")
-
------------------------------------------------------------------------------
--- Module declaration
------------------------------------------------------------------------------
-local json = {}             -- Public namespace
-local json_private = {}     -- Private namespace
-
--- Public functions
-
--- Private functions
-local decode_scanArray
-local decode_scanComment
-local decode_scanConstant
-local decode_scanNumber
-local decode_scanObject
-local decode_scanString
-local decode_scanWhitespace
-local encodeString
-local isArray
-local isEncodable
-
------------------------------------------------------------------------------
--- PUBLIC FUNCTIONS
------------------------------------------------------------------------------
---- Encodes an arbitrary Lua object / variable.
--- @param v The Lua object / variable to be JSON encoded.
--- @return String containing the JSON encoding in internal Lua string format (i.e. not unicode)
-function json.encode (v)
-  -- Handle nil values
-  if v==nil then
-    return "null"
-  end
-  
-  local vtype = type(v)
-
-  -- Handle strings
-  if vtype=='string' then    
-    return '"' .. json_private.encodeString(v) .. '"'     -- Need to handle encoding in string
-  end
-  
-  -- Handle booleans
-  if vtype=='number' or vtype=='boolean' then
-    return tostring(v)
-  end
-  
-  -- Handle tables
-  if vtype=='table' then
-    local rval = {}
-    -- Consider arrays separately
-    local bArray, maxCount = isArray(v)
-    if bArray then
-      for i = 1,maxCount do
-        table.insert(rval, json.encode(v[i]))
-      end
-    else  -- An object, not an array
-      for i,j in pairs(v) do
-        if isEncodable(i) and isEncodable(j) then
-          table.insert(rval, '"' .. json_private.encodeString(i) .. '":' .. json.encode(j))
-        end
-      end
-    end
-    if bArray then
-      return '[' .. table.concat(rval,',') ..']'
-    else
-      return '{' .. table.concat(rval,',') .. '}'
-    end
-  end
-  
-  -- Handle null values
-  if vtype=='function' and v==null then
-    return 'null'
-  end
-  
-  assert(false,'encode attempt to encode unsupported type ' .. vtype .. ':' .. tostring(v))
-end
-
-
---- Decodes a JSON string and returns the decoded value as a Lua data structure / value.
--- @param s The string to scan.
--- @param [startPos] Optional starting position where the JSON string is located. Defaults to 1.
--- @param Lua object, number The object that was scanned, as a Lua table / string / number / boolean or nil,
--- and the position of the first character after
--- the scanned JSON object.
-function json.decode(s, startPos)
-  startPos = startPos and startPos or 1
-  startPos = decode_scanWhitespace(s,startPos)
-  assert(startPos<=string.len(s), 'Unterminated JSON encoded object found at position in [' .. s .. ']')
-  local curChar = string.sub(s,startPos,startPos)
-  -- Object
-  if curChar=='{' then
-    return decode_scanObject(s,startPos)
-  end
-  -- Array
-  if curChar=='[' then
-    return decode_scanArray(s,startPos)
-  end
-  -- Number
-  if string.find("+-0123456789.e", curChar, 1, true) then
-    return decode_scanNumber(s,startPos)
-  end
-  -- String
-  if curChar==[["]] or curChar==[[']] then
-    return decode_scanString(s,startPos)
-  end
-  if string.sub(s,startPos,startPos+1)=='/*' then
-    return decode(s, decode_scanComment(s,startPos))
-  end
-  -- Otherwise, it must be a constant
-  return decode_scanConstant(s,startPos)
-end
-
---- The null function allows one to specify a null value in an associative array (which is otherwise
--- discarded if you set the value with 'nil' in Lua. Simply set t = { first=json.null }
-function null()
-  return null -- so json.null() will also return null ;-)
-end
------------------------------------------------------------------------------
--- Internal, PRIVATE functions.
--- Following a Python-like convention, I have prefixed all these 'PRIVATE'
--- functions with an underscore.
------------------------------------------------------------------------------
-
---- Scans an array from JSON into a Lua object
--- startPos begins at the start of the array.
--- Returns the array and the next starting position
--- @param s The string being scanned.
--- @param startPos The starting position for the scan.
--- @return table, int The scanned array as a table, and the position of the next character to scan.
-function decode_scanArray(s,startPos)
-  local array = {}  -- The return value
-  local stringLen = string.len(s)
-  assert(string.sub(s,startPos,startPos)=='[','decode_scanArray called but array does not start at position ' .. startPos .. ' in string:\n'..s )
-  startPos = startPos + 1
-  -- Infinite loop for array elements
-  repeat
-    startPos = decode_scanWhitespace(s,startPos)
-    assert(startPos<=stringLen,'JSON String ended unexpectedly scanning array.')
-    local curChar = string.sub(s,startPos,startPos)
-    if (curChar==']') then
-      return array, startPos+1
-    end
-    if (curChar==',') then
-      startPos = decode_scanWhitespace(s,startPos+1)
-    end
-    assert(startPos<=stringLen, 'JSON String ended unexpectedly scanning array.')
-    object, startPos = json.decode(s,startPos)
-    table.insert(array,object)
-  until false
-end
-
---- Scans a comment and discards the comment.
--- Returns the position of the next character following the comment.
--- @param string s The JSON string to scan.
--- @param int startPos The starting position of the comment
-function decode_scanComment(s, startPos)
-  assert( string.sub(s,startPos,startPos+1)=='/*', "decode_scanComment called but comment does not start at position " .. startPos)
-  local endPos = string.find(s,'*/',startPos+2)
-  assert(endPos~=nil, "Unterminated comment in string at " .. startPos)
-  return endPos+2  
-end
-
---- Scans for given constants: true, false or null
--- Returns the appropriate Lua type, and the position of the next character to read.
--- @param s The string being scanned.
--- @param startPos The position in the string at which to start scanning.
--- @return object, int The object (true, false or nil) and the position at which the next character should be 
--- scanned.
-function decode_scanConstant(s, startPos)
-  local consts = { ["true"] = true, ["false"] = false, ["null"] = nil }
-  local constNames = {"true","false","null"}
-
-  for i,k in pairs(constNames) do
-    if string.sub(s,startPos, startPos + string.len(k) -1 )==k then
-      return consts[k], startPos + string.len(k)
-    end
-  end
-  assert(nil, 'Failed to scan constant from string ' .. s .. ' at starting position ' .. startPos)
-end
-
---- Scans a number from the JSON encoded string.
--- (in fact, also is able to scan numeric +- eqns, which is not
--- in the JSON spec.)
--- Returns the number, and the position of the next character
--- after the number.
--- @param s The string being scanned.
--- @param startPos The position at which to start scanning.
--- @return number, int The extracted number and the position of the next character to scan.
-function decode_scanNumber(s,startPos)
-  local endPos = startPos+1
-  local stringLen = string.len(s)
-  local acceptableChars = "+-0123456789.e"
-  while (string.find(acceptableChars, string.sub(s,endPos,endPos), 1, true)
-  and endPos<=stringLen
-  ) do
-    endPos = endPos + 1
-  end
-  local stringValue = 'return ' .. string.sub(s,startPos, endPos-1)
-  local stringEval = loadstring(stringValue)
-  assert(stringEval, 'Failed to scan number [ ' .. stringValue .. '] in JSON string at position ' .. startPos .. ' : ' .. endPos)
-  return stringEval(), endPos
-end
-
---- Scans a JSON object into a Lua object.
--- startPos begins at the start of the object.
--- Returns the object and the next starting position.
--- @param s The string being scanned.
--- @param startPos The starting position of the scan.
--- @return table, int The scanned object as a table and the position of the next character to scan.
-function decode_scanObject(s,startPos)
-  local object = {}
-  local stringLen = string.len(s)
-  local key, value
-  assert(string.sub(s,startPos,startPos)=='{','decode_scanObject called but object does not start at position ' .. startPos .. ' in string:\n' .. s)
-  startPos = startPos + 1
-  repeat
-    startPos = decode_scanWhitespace(s,startPos)
-    assert(startPos<=stringLen, 'JSON string ended unexpectedly while scanning object.')
-    local curChar = string.sub(s,startPos,startPos)
-    if (curChar=='}') then
-      return object,startPos+1
-    end
-    if (curChar==',') then
-      startPos = decode_scanWhitespace(s,startPos+1)
-    end
-    assert(startPos<=stringLen, 'JSON string ended unexpectedly scanning object.')
-    -- Scan the key
-    key, startPos = json.decode(s,startPos)
-    assert(startPos<=stringLen, 'JSON string ended unexpectedly searching for value of key ' .. key)
-    startPos = decode_scanWhitespace(s,startPos)
-    assert(startPos<=stringLen, 'JSON string ended unexpectedly searching for value of key ' .. key)
-    assert(string.sub(s,startPos,startPos)==':','JSON object key-value assignment mal-formed at ' .. startPos)
-    startPos = decode_scanWhitespace(s,startPos+1)
-    assert(startPos<=stringLen, 'JSON string ended unexpectedly searching for value of key ' .. key)
-    value, startPos = json.decode(s,startPos)
-    object[key]=value
-  until false -- infinite loop while key-value pairs are found
-end
-
--- START SoniEx2
--- Initialize some things used by decode_scanString
--- You know, for efficiency
-local escapeSequences = {
-  ["\\t"] = "\t",
-  ["\\f"] = "\f",
-  ["\\r"] = "\r",
-  ["\\n"] = "\n",
-  ["\\b"] = "\b"
-}
-setmetatable(escapeSequences, {__index = function(t,k)
-  -- skip "\" aka strip escape
-  return string.sub(k,2)
-end})
--- END SoniEx2
-
---- Scans a JSON string from the opening inverted comma or single quote to the
--- end of the string.
--- Returns the string extracted as a Lua string,
--- and the position of the next non-string character
--- (after the closing inverted comma or single quote).
--- @param s The string being scanned.
--- @param startPos The starting position of the scan.
--- @return string, int The extracted string as a Lua string, and the next character to parse.
-function decode_scanString(s,startPos)
-  assert(startPos, 'decode_scanString(..) called without start position')
-  local startChar = string.sub(s,startPos,startPos)
-  -- START SoniEx2
-  -- PS: I don't think single quotes are valid JSON
-  assert(startChar == [["]] or startChar == [[']],'decode_scanString called for a non-string')
-  --assert(startPos, "String decoding failed: missing closing " .. startChar .. " for string at position " .. oldStart)
-  local t = {}
-  local i,j = startPos,startPos
-  while string.find(s, startChar, j+1) ~= j+1 do
-    local oldj = j
-    i,j = string.find(s, "\\.", j+1)
-    local x,y = string.find(s, startChar, oldj+1)
-    if not i or x < i then
-      i,j = x,y-1
-    end
-    table.insert(t, string.sub(s, oldj+1, i-1))
-    if string.sub(s, i, j) == "\\u" then
-      local a = string.sub(s,j+1,j+4)
-      j = j + 4
-      local n = tonumber(a, 16)
-      assert(n, "String decoding failed: bad Unicode escape " .. a .. " at position " .. i .. " : " .. j)
-      -- math.floor(x/2^y) == lazy right shift
-      -- a % 2^b == bitwise_and(a, (2^b)-1)
-      -- 64 = 2^6
-      -- 4096 = 2^12 (or 2^6 * 2^6)
-      local x
-      if n < 0x80 then
-        x = string.char(n % 0x80)
-      elseif n < 0x800 then
-        -- [110x xxxx] [10xx xxxx]
-        x = string.char(0xC0 + (math.floor(n/64) % 0x20), 0x80 + (n % 0x40))
-      else
-        -- [1110 xxxx] [10xx xxxx] [10xx xxxx]
-        x = string.char(0xE0 + (math.floor(n/4096) % 0x10), 0x80 + (math.floor(n/64) % 0x40), 0x80 + (n % 0x40))
-      end
-      table.insert(t, x)
-    else
-      table.insert(t, escapeSequences[string.sub(s, i, j)])
-    end
-  end
-  --table.insert(t,string.sub(s,j, j+1))
-  assert(string.find(s, startChar, j+1), "String decoding failed: missing closing " .. startChar .. " at position " .. j .. "(for string at position " .. startPos .. ")")
-  return table.concat(t,""), j+2
-  -- END SoniEx2
-end
-
---- Scans a JSON string skipping all whitespace from the current start position.
--- Returns the position of the first non-whitespace character, or nil if the whole end of string is reached.
--- @param s The string being scanned
--- @param startPos The starting position where we should begin removing whitespace.
--- @return int The first position where non-whitespace was encountered, or string.len(s)+1 if the end of string
--- was reached.
-function decode_scanWhitespace(s,startPos)
-  local whitespace=" \n\r\t"
-  local stringLen = string.len(s)
-  while ( string.find(whitespace, string.sub(s,startPos,startPos), 1, true)  and startPos <= stringLen) do
-    startPos = startPos + 1
-  end
-  return startPos
-end
-
---- Encodes a string to be JSON-compatible.
--- This just involves back-quoting inverted commas, back-quotes and newlines, I think ;-)
--- @param s The string to return as a JSON encoded (i.e. backquoted string)
--- @return The string appropriately escaped.
-
-local escapeList = {
-    ['"']  = '\\"',
-    ['\\'] = '\\\\',
-    ['/']  = '\\/', 
-    ['\b'] = '\\b',
-    ['\f'] = '\\f',
-    ['\n'] = '\\n',
-    ['\r'] = '\\r',
-    ['\t'] = '\\t'
-}
-
-function json_private.encodeString(s)
- local s = tostring(s)
- return s:gsub(".", function(c) return escapeList[c] end) -- SoniEx2: 5.0 compat
-end
-
--- Determines whether the given Lua type is an array or a table / dictionary.
--- We consider any table an array if it has indexes 1..n for its n items, and no
--- other data in the table.
--- I think this method is currently a little 'flaky', but can't think of a good way around it yet...
--- @param t The table to evaluate as an array
--- @return boolean, number True if the table can be represented as an array, false otherwise. If true,
--- the second returned value is the maximum
--- number of indexed elements in the array. 
-function isArray(t)
-  -- Next we count all the elements, ensuring that any non-indexed elements are not-encodable 
-  -- (with the possible exception of 'n')
-  local maxIndex = 0
-  for k,v in pairs(t) do
-    if (type(k)=='number' and math.floor(k)==k and 1<=k) then -- k,v is an indexed pair
-      if (not isEncodable(v)) then return false end -- All array elements must be encodable
-      maxIndex = math.max(maxIndex,k)
-    else
-      if (k=='n') then
-        if v ~= table.getn(t) then return false end  -- False if n does not hold the number of elements
-      else -- Else of (k=='n')
-        if isEncodable(v) then return false end
-      end  -- End of (k~='n')
-    end -- End of k,v not an indexed pair
-  end  -- End of loop across all pairs
-  return true, maxIndex
-end
-
---- Determines whether the given Lua object / table / variable can be JSON encoded. The only
--- types that are JSON encodable are: string, boolean, number, nil, table and json.null.
--- In this implementation, all other types are ignored.
--- @param o The object to examine.
--- @return boolean True if the object should be JSON encoded, false if it should be ignored.
-function isEncodable(o)
-  local t = type(o)
-  return (t=='string' or t=='boolean' or t=='number' or t=='nil' or t=='table') or (t=='function' and o==null) 
-end
-
-return json

+ 0 - 281
spider/download.go

@@ -1,281 +0,0 @@
-/**
-GO代码相对简单,
-重点处理下载工具,爬虫启动,监控等。
-逻辑处理交给LUA处理
-*/
-package spider
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"log"
-	"math/rand"
-	mu "mfw/util"
-	"net/http"
-	"regexp"
-	util "spiderutil"
-	"time"
-
-	"github.com/surfer/agent"
-)
-
-var regImgStr = "\\.(JPG|jpg|GIF|gif|PNG|png|BMP|bmp)$"
-var regImg *regexp.Regexp
-var GarbledCodeReg = regexp.MustCompile("[纰锟绲庯卞鍤滐銇鐟閫嚜鎯壐璩鏉彲鍋撅绺閲嗭絣鐤鏅盫鎽亰寰钂鎳鍒鐏宀婾嗚亗鎬憰攬鍙嶁鑻疐璁鐞鏇顭庮渾寮鑶剸鐙鈪鍐実綍擄鐒鐛绫瀵珐鍡閬栬憟灞綅顡韪忚鍓笉犵鍎鐥慪璜钀氭畯焛鎲顏熺崿鍜鍩僜鍚褰囶鍘櫥闀撹棢檅閯嗏絖灦戝閹涜闇鐮捒鈥璺籏绶澶鎷樺鍌絒嗘鍊ク鐧榦璞嚟鍢鐡瓼屾煢宄鑽畵鎭鈹鑷稛磭鏋孊钄狅絆鐘塋尟鑺絍绂绗嘐幇璨閾戭嚦鐫婅檴碭妤鑴厷挰鐜縒闆憁鏃鐗猒鏁橈顤秨哵鍧紛濊閷顥閺惪鐓嶈亙濠掗帾媞鏀慿瓙鎺闁鎰鑸鎹皝鍔鍦骞閶鍞挾鎴竗閵繉闋戞籅閽欏閼縲鐣呮墔顐ら憼檾锝挻顚炶姂剾鐑鐭潛閰涳楂懘願澧亣倴鐦忕嫄刡灏棙宓媐铇甀鏂楁従態瀹揕闃姒炲矕鏌眱鍍熸腹儝绱獻鐬鑵矦鍝嗗墹崇琛勭仈濴顒剭閴鍏鐝曨锛よ顧勯槈夊潏鐖垚矑鍛瞋終缂鐪鍠鏆妫攏顪娌濆嘇璎厫鍗閮顝給榇婂唭姘燁鏍鑹笎爑嚔槌瀣糵炵櫤鐎闅ゅ類鐨夛绋搕缃娉犲搻鐠儧鋸闉攜楸ㄨ埧欒闊垱鈩厔弐顠拵鑾]+")
-
-func init() {
-	regImg, _ = regexp.Compile(regImgStr)
-}
-
-//下载页面,发送消息,等待别人下载
-func Download(downloadnode, downloaderid, url, method string, head map[string]interface{}, encoding string, useproxy, ishttps bool, code string, timeout int64) string {
-	defer mu.Catch()
-	ResultMsclient := MsclientTest
-	if downloadnode == "test" { //805
-		ResultMsclient = MsclientTest
-	} else if downloadnode == "comm" { //801
-		ResultMsclient = Msclient
-	} else if downloadnode == "bid" { //803
-		ResultMsclient = MsclientBid
-	}
-	msgid := mu.UUID(8)
-	if len(head) < 1 {
-		l := len(agent.UserAgents["common"])
-		r := rand.New(rand.NewSource(time.Now().UnixNano()))
-		head["User-Agent"] = agent.UserAgents["common"][r.Intn(l)]
-	}
-	isImg := regImg.MatchString(url)
-	var ret []byte
-	var err error
-	if downloaderid == "" {
-		ret, err = ResultMsclient.Call("", msgid, mu.SERVICE_DOWNLOAD, mu.SENDTO_TYPE_RAND_RECIVER, map[string]interface{}{
-			"url":      url,
-			"method":   method,
-			"head":     head,
-			"encoding": encoding,
-			"useproxy": useproxy,
-			"ishttps":  ishttps,
-		}, timeout)
-	} else {
-		if isAvailable(downloaderid) {
-			ret, err = ResultMsclient.Call(downloaderid, msgid, mu.SERVICE_DOWNLOAD, mu.SENDTO_TYPE_P2P, map[string]interface{}{
-				"url":      url,
-				"method":   method,
-				"head":     head,
-				"encoding": encoding,
-				"useproxy": useproxy,
-				"ishttps":  ishttps,
-			}, timeout)
-		} else {
-			return ""
-		}
-	}
-	if err != nil {
-		str := "方法DownloadAdv,url:" + url + ",err:" + err.Error()
-		log.Println(str)
-	}
-	tmp := map[string]interface{}{}
-	json.Unmarshal(ret, &tmp)
-	if v, ok := tmp["code"].(string); ok && v == "200" {
-		if isImg {
-			bs, _ := tmp["content"].(string)
-			return string(bs)
-		} else {
-			bs, _ := base64.StdEncoding.DecodeString(tmp["content"].(string))
-			return string(bs)
-		}
-	} else {
-		return ""
-	}
-}
-
-//下载页面,发送消息,等待别人下载
-func DownloadAdv(downloadnode, downloaderid, url, method string, reqparam, head map[string]interface{}, mycookie []*http.Cookie, encoding string, useproxy, ishttps bool, code string, timeout int64) (string, []*http.Cookie) {
-	defer mu.Catch()
-	ResultMsclient := MsclientTest
-	if downloadnode == "test" { //805
-		ResultMsclient = MsclientTest
-	} else if downloadnode == "comm" { //801
-		ResultMsclient = Msclient
-	} else if downloadnode == "bid" { //803
-		ResultMsclient = MsclientBid
-	}
-	msgid := mu.UUID(8)
-	if len(head) < 1 {
-		l := len(agent.UserAgents["common"])
-		r := rand.New(rand.NewSource(time.Now().UnixNano()))
-		head["User-Agent"] = agent.UserAgents["common"][r.Intn(l)]
-	}
-	isImg := regImg.MatchString(url)
-	var ret []byte
-	var err error
-	if downloaderid == "" {
-		ret, err = ResultMsclient.Call("", msgid, mu.SERVICE_DOWNLOAD, mu.SENDTO_TYPE_RAND_RECIVER, map[string]interface{}{
-			"url":      url,
-			"method":   method,
-			"head":     head,
-			"reqparam": reqparam,
-			"cookie":   mycookie,
-			"encoding": encoding,
-			"useproxy": useproxy,
-			"ishttps":  ishttps,
-		}, timeout)
-	} else {
-		if isAvailable(downloaderid) {
-			ret, err = ResultMsclient.Call(downloaderid, msgid, mu.SERVICE_DOWNLOAD, mu.SENDTO_TYPE_P2P, map[string]interface{}{
-				"url":      url,
-				"method":   method,
-				"head":     head,
-				"reqparam": reqparam,
-				"cookie":   mycookie,
-				"encoding": encoding,
-				"useproxy": useproxy,
-				"ishttps":  ishttps,
-			}, timeout)
-		} else {
-			return "", nil
-		}
-	}
-	if err != nil {
-		str := "方法DownloadAdv,url:" + url + ",err:" + err.Error()
-		log.Println(str)
-	}
-	tmp := map[string]interface{}{}
-	json.Unmarshal(ret, &tmp)
-	cooks := util.ParseHttpCookie(tmp["cookie"])
-	if v, ok := tmp["code"].(string); ok && v == "200" {
-		if isImg {
-			bs, _ := tmp["content"].(string)
-			return string(bs), cooks
-		} else {
-			bs, _ := base64.StdEncoding.DecodeString(tmp["content"].(string))
-			return string(bs), cooks
-		}
-	} else {
-		return "", nil
-	}
-}
-func DownloadFile(downloaderid, url, method string, reqparam, head map[string]interface{}, mycookie []*http.Cookie, encoding string, useproxy, ishttps bool, code string, timeout int64) []byte {
-	defer mu.Catch()
-	timeout = timeout * 10
-	msgid := mu.UUID(8)
-	if len(head) < 1 {
-		l := len(agent.UserAgents["common"])
-		r := rand.New(rand.NewSource(time.Now().UnixNano()))
-		head["User-Agent"] = agent.UserAgents["common"][r.Intn(l)]
-	}
-	var ret []byte
-	var err error
-	if downloaderid == "" {
-		ret, err = MsclientFile.Call("", msgid, mu.SERVICE_DOWNLOAD, mu.SENDTO_TYPE_RAND_RECIVER, map[string]interface{}{
-			"url":      url,
-			"method":   method,
-			"head":     head,
-			"reqparam": reqparam,
-			"cookie":   mycookie,
-			"encoding": encoding,
-			"useproxy": useproxy,
-			"ishttps":  ishttps,
-		}, timeout)
-	} else {
-		if isAvailableFile(downloaderid) {
-			ret, err = MsclientFile.Call(downloaderid, msgid, mu.SERVICE_DOWNLOAD, mu.SENDTO_TYPE_P2P, map[string]interface{}{
-				"url":      url,
-				"method":   method,
-				"head":     head,
-				"reqparam": reqparam,
-				"cookie":   mycookie,
-				"encoding": encoding,
-				"useproxy": useproxy,
-				"ishttps":  ishttps,
-			}, timeout)
-		} else {
-			return nil
-		}
-	}
-	if err != nil {
-		str := code + "方法DownloadFile,url:" + url + ",err:" + err.Error()
-		log.Println(str, timeout)
-	}
-	tmp := map[string]interface{}{}
-	json.Unmarshal(ret, &tmp)
-	if v, ok := tmp["code"].(string); ok && v == "200" {
-		bs, _ := base64.StdEncoding.DecodeString(tmp["content"].(string))
-		return bs
-	} else {
-		return nil
-	}
-}
-
-func DownloadFile_back(downloaderid, url, method string, reqparam, head map[string]interface{}, mycookie []*http.Cookie, encoding string, useproxy, ishttps bool, code string, timeout int64) []byte {
-	defer mu.Catch()
-	msgid := mu.UUID(8)
-	if len(head) < 1 {
-		l := len(agent.UserAgents["common"])
-		r := rand.New(rand.NewSource(time.Now().UnixNano()))
-		head["User-Agent"] = agent.UserAgents["common"][r.Intn(l)]
-	}
-	var ret []byte
-	var err error
-	if downloaderid == "" {
-		ret, err = Msclient.Call("", msgid, mu.SERVICE_DOWNLOAD, mu.SENDTO_TYPE_RAND_RECIVER, map[string]interface{}{
-			"url":      url,
-			"method":   method,
-			"head":     head,
-			"reqparam": reqparam,
-			"cookie":   mycookie,
-			"encoding": encoding,
-			"useproxy": useproxy,
-			"ishttps":  ishttps,
-		}, timeout)
-	} else {
-		if isAvailable(downloaderid) {
-			ret, err = Msclient.Call(downloaderid, msgid, mu.SERVICE_DOWNLOAD, mu.SENDTO_TYPE_P2P, map[string]interface{}{
-				"url":      url,
-				"method":   method,
-				"head":     head,
-				"reqparam": reqparam,
-				"cookie":   mycookie,
-				"encoding": encoding,
-				"useproxy": useproxy,
-				"ishttps":  ishttps,
-			}, timeout)
-		} else {
-			return nil
-		}
-	}
-	if err != nil {
-		str := "方法DownloadFile,url:" + url + ",err:" + err.Error()
-		log.Println(map[string]interface{}{"code": code, "content": str, "comeintime": time.Now().Unix()})
-	}
-	tmp := map[string]interface{}{}
-	json.Unmarshal(ret, &tmp)
-	if v, ok := tmp["code"].(string); ok && v == "200" {
-		bs, _ := base64.StdEncoding.DecodeString(tmp["content"].(string))
-		return bs
-	} else {
-		return nil
-	}
-}
-
-//下载点是否可用
-func isAvailable(code string) bool {
-	b := false
-	for k, _ := range Alldownloader {
-		if k == code {
-			b = true
-		}
-	}
-	return b
-}
-
-//下载点是否可用
-func isAvailableFile(code string) bool {
-	b := false
-	for k, _ := range AlldownloaderFile {
-		if k == code {
-			b = true
-		}
-	}
-	return b
-}

+ 0 - 215
spider/msclient.go

@@ -1,215 +0,0 @@
-// msclient
-package spider
-
-import (
-	"math/rand"
-	mu "mfw/util"
-	"time"
-)
-
-//
-type DynamicIPMap struct {
-	Code        string
-	InvalidTime int64
-}
-
-var Msclient *mu.Client
-var MsclientFile *mu.Client
-var MsclientBid *mu.Client
-var MsclientTest *mu.Client
-var Alldownloader map[string]DynamicIPMap = make(map[string]DynamicIPMap)
-var AlldownloaderBid map[string]DynamicIPMap = make(map[string]DynamicIPMap)
-var AlldownloaderFile map[string]DynamicIPMap = make(map[string]DynamicIPMap)
-var AlldownloaderTest map[string]DynamicIPMap = make(map[string]DynamicIPMap)
-
-//
-func processevent(p *mu.Packet) {
-	defer mu.Catch()
-	var data []byte
-	switch p.Event {
-	case mu.SERVICE_DOWNLOAD_APPEND_NODE:
-		data = p.GetBusinessData()
-		//log.Println("获取动态地址:", len(data), string(data))
-		for i := 0; i < len(data)/8; i++ {
-			code := string(data[i*8 : (i+1)*8])
-			Alldownloader[code] = DynamicIPMap{
-				Code:        code,
-				InvalidTime: time.Now().Unix() + 60*10,
-			}
-		}
-	case mu.SERVICE_DOWNLOAD_DELETE_NODE:
-		data = p.GetBusinessData()
-		//log.Println("删除动态地址:", len(data), string(data))
-		for i := 0; i < len(data)/8; i++ {
-			code := string(data[i*8 : (i+1)*8])
-			delete(Alldownloader, code)
-		}
-	}
-}
-func processeventbid(p *mu.Packet) {
-	defer mu.Catch()
-	var data []byte
-	switch p.Event {
-	case mu.SERVICE_DOWNLOAD_APPEND_NODE:
-		data = p.GetBusinessData()
-		//log.Println("获取动态地址:", len(data), string(data))
-		for i := 0; i < len(data)/8; i++ {
-			code := string(data[i*8 : (i+1)*8])
-			AlldownloaderBid[code] = DynamicIPMap{
-				Code:        code,
-				InvalidTime: time.Now().Unix() + 60*10,
-			}
-		}
-	case mu.SERVICE_DOWNLOAD_DELETE_NODE:
-		data = p.GetBusinessData()
-		//log.Println("删除动态地址:", len(data), string(data))
-		for i := 0; i < len(data)/8; i++ {
-			code := string(data[i*8 : (i+1)*8])
-			delete(AlldownloaderBid, code)
-		}
-	}
-}
-func processeventFile(p *mu.Packet) {
-	defer mu.Catch()
-	var data []byte
-	switch p.Event {
-	case mu.SERVICE_DOWNLOAD_APPEND_NODE:
-		data = p.GetBusinessData()
-		//log.Println("获取动态地址:", len(data), string(data))
-		for i := 0; i < len(data)/8; i++ {
-			code := string(data[i*8 : (i+1)*8])
-			AlldownloaderFile[code] = DynamicIPMap{
-				Code:        code,
-				InvalidTime: time.Now().Unix() + 60*10,
-			}
-		}
-	case mu.SERVICE_DOWNLOAD_DELETE_NODE:
-		data = p.GetBusinessData()
-		//log.Println("删除动态地址:", len(data), string(data))
-		for i := 0; i < len(data)/8; i++ {
-			code := string(data[i*8 : (i+1)*8])
-			delete(AlldownloaderFile, code)
-		}
-	}
-}
-func processeventTest(p *mu.Packet) {
-	defer mu.Catch()
-	var data []byte
-	switch p.Event {
-	case mu.SERVICE_DOWNLOAD_APPEND_NODE:
-		data = p.GetBusinessData()
-		//log.Println("获取动态地址:", len(data), string(data))
-		for i := 0; i < len(data)/8; i++ {
-			code := string(data[i*8 : (i+1)*8])
-			AlldownloaderTest[code] = DynamicIPMap{
-				Code:        code,
-				InvalidTime: time.Now().Unix() + 60*10,
-			}
-		}
-	case mu.SERVICE_DOWNLOAD_DELETE_NODE:
-		data = p.GetBusinessData()
-		//log.Println("删除动态地址:", len(data), string(data))
-		for i := 0; i < len(data)/8; i++ {
-			code := string(data[i*8 : (i+1)*8])
-			delete(AlldownloaderTest, code)
-		}
-	}
-}
-
-//
-func gc4Alldownloader() {
-	n := time.Now().Unix()
-	for _, v := range Alldownloader {
-		if v.InvalidTime < n {
-			delete(Alldownloader, v.Code)
-		}
-	}
-	time.AfterFunc(1*time.Minute, gc4Alldownloader)
-}
-func gc4AlldownloaderBid() {
-	n := time.Now().Unix()
-	for _, v := range AlldownloaderBid {
-		if v.InvalidTime < n {
-			delete(AlldownloaderBid, v.Code)
-		}
-	}
-	time.AfterFunc(1*time.Minute, gc4AlldownloaderBid)
-}
-func gc4AlldownloaderFile() {
-	n := time.Now().Unix()
-	for _, v := range AlldownloaderFile {
-		if v.InvalidTime < n {
-			delete(AlldownloaderFile, v.Code)
-		}
-	}
-	time.AfterFunc(1*time.Minute, gc4AlldownloaderFile)
-}
-func gc4AlldownloaderTest() {
-	n := time.Now().Unix()
-	for _, v := range AlldownloaderTest {
-		if v.InvalidTime < n {
-			delete(AlldownloaderTest, v.Code)
-		}
-	}
-	time.AfterFunc(1*time.Minute, gc4AlldownloaderTest)
-}
-
-//
-func GetOneDownloader() string {
-	if len(AlldownloaderTest) < 1 {
-		return ""
-	}
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	pos := r.Intn(len(AlldownloaderTest))
-	index := 0
-	retcode := ""
-	for k, _ := range AlldownloaderTest {
-		if index == pos {
-			retcode = k
-			break
-		}
-		index++
-	}
-	return retcode
-}
-
-//初始化,启动消息客户端
-func InitMsgClient(serveraddr, serveraddrbid, serveraddrtest, name, namebid, nametest string) {
-	Msclient, _ = mu.NewClient(&mu.ClientConfig{ClientName: name,
-		MsgServerAddr:   serveraddr,
-		EventHandler:    processevent,
-		CanHandleEvents: []int{mu.SERVICE_DOWNLOAD_APPEND_NODE, mu.SERVICE_DOWNLOAD_DELETE_NODE},
-		ReadBufferSize:  10,
-		WriteBufferSize: 10,
-	})
-	go gc4Alldownloader()
-
-	MsclientBid, _ = mu.NewClient(&mu.ClientConfig{ClientName: namebid,
-		MsgServerAddr:   serveraddrbid,
-		EventHandler:    processeventbid,
-		CanHandleEvents: []int{mu.SERVICE_DOWNLOAD_APPEND_NODE, mu.SERVICE_DOWNLOAD_DELETE_NODE},
-		ReadBufferSize:  10,
-		WriteBufferSize: 10,
-	})
-	go gc4AlldownloaderBid()
-
-	MsclientTest, _ = mu.NewClient(&mu.ClientConfig{ClientName: nametest,
-		MsgServerAddr:   serveraddrtest,
-		EventHandler:    processeventTest,
-		CanHandleEvents: []int{mu.SERVICE_DOWNLOAD_APPEND_NODE, mu.SERVICE_DOWNLOAD_DELETE_NODE},
-		ReadBufferSize:  10,
-		WriteBufferSize: 10,
-	})
-	go gc4AlldownloaderTest()
-}
-
-func InitMsgClientFile(serveraddr, name string) {
-	MsclientFile, _ = mu.NewClient(&mu.ClientConfig{ClientName: name,
-		MsgServerAddr:   serveraddr,
-		EventHandler:    processeventFile,
-		CanHandleEvents: []int{mu.SERVICE_DOWNLOAD_APPEND_NODE, mu.SERVICE_DOWNLOAD_DELETE_NODE},
-		ReadBufferSize:  200,
-		WriteBufferSize: 200,
-	})
-	go gc4AlldownloaderFile()
-}

+ 0 - 503
spider/script.go

@@ -1,503 +0,0 @@
-/**
-脚本加载+调用 封装,
-前期走文件系统加载
-后期走数据库配置,
-LUA中公共的方法需要抽出来,主脚本文件加载LUA公共文件
-*/
-package spider
-
-import (
-	"bytes"
-	"compress/gzip"
-	"crypto/aes"
-	"encoding/base64"
-	"encoding/json"
-	"io/ioutil"
-	mu "mfw/util"
-	"net/http"
-	"net/url"
-	"path"
-	qu "qfw/util"
-	"regexp"
-	util "spiderutil"
-	"strconv"
-	"strings"
-	"time"
-
-	"golang.org/x/text/encoding/simplifiedchinese"
-	"golang.org/x/text/transform"
-
-	"github.com/cjoudrey/gluahttp"
-	lujson "github.com/yuin/gopher-json"
-	"github.com/yuin/gopher-lua"
-)
-
-//脚本
-type Script struct {
-	SCode, ScriptFile string
-	Encoding          string
-	Downloader        string //下载器
-	Timeout           int64  //超时时间秒
-	L                 *lua.LState
-	Test_luareqcount  int //脚本请求次数
-	Test_goreqtime    int //go发起次数(时间)
-	Test_goreqlist    int //go发起次数(列表)
-	Test_goreqcon     int //go发起次数(正文)
-}
-
-//加载文件
-func (s *Script) LoadScript(downloadnode, script string, isfile ...string) {
-	s.ScriptFile = script
-	options := lua.Options{
-		RegistrySize:        256 * 20,
-		CallStackSize:       256,
-		IncludeGoStackTrace: false,
-	}
-	s.L = lua.NewState(options)
-	//s.L.ScriptFileName = s.SCode
-	s.L.PreloadModule("http", gluahttp.NewHttpModule(&http.Client{}).Loader)
-	s.L.PreloadModule("json", lujson.Loader)
-	if len(isfile) > 0 {
-		if err := s.L.DoFile(script); err != nil {
-			panic("加载lua脚本错误" + err.Error())
-		}
-	} else {
-		if err := s.L.DoString(script); err != nil {
-			panic("加载lua脚本错误" + err.Error())
-		}
-	}
-
-	s.Encoding = s.GetVar("spiderPageEncoding")
-	//暴露go方法
-	//download(url,head) 普通下载
-	s.L.SetGlobal("download", s.L.NewFunction(func(S *lua.LState) int {
-		head := S.ToTable(-1)
-		url := S.ToString(-2)
-		ishttps := S.ToBool(-3)
-		charset := S.ToString(-4)
-		if charset == "" {
-			charset = s.Encoding
-		}
-		ret := Download(downloadnode, s.Downloader, url, "get", util.GetTable(head), charset, false, ishttps, "", s.Timeout)
-		S.Push(lua.LString(ret))
-		s.Test_luareqcount++
-		return 1
-	}))
-	s.L.SetGlobal("findContentText", s.L.NewFunction(func(S *lua.LState) int {
-		gpath := S.ToString(-2)
-		content := S.ToString(-1)
-		ret := util.FindContentText(gpath, content)
-		S.Push(ret)
-		return 1
-	}))
-	//高级下载download(url,method,param,head,cookie)
-	s.L.SetGlobal("downloadAdv", s.L.NewFunction(func(S *lua.LState) int {
-		cookie := S.ToString(-1)
-		head := S.ToTable(-2)
-		param := S.ToTable(-3)
-		method := S.ToString(-4)
-		url := S.ToString(-5)
-		ishttps := S.ToBool(-6)
-		charset := S.ToString(-7)
-		if charset == "" {
-			charset = s.Encoding
-		}
-		var mycookie []*http.Cookie
-		json.Unmarshal([]byte(cookie), &mycookie)
-		var ret string
-		var retcookie []*http.Cookie
-		if param == nil {
-			ptext := map[string]interface{}{"text": S.ToString(-3)}
-			ret, retcookie = DownloadAdv(downloadnode, s.Downloader, url, method, ptext, util.GetTable(head), mycookie, charset, false, ishttps, "", s.Timeout)
-		} else {
-			ret, retcookie = DownloadAdv(downloadnode, s.Downloader, url, method, util.GetTable(param), util.GetTable(head), mycookie, charset, false, ishttps, "", s.Timeout)
-		}
-
-		S.Push(lua.LString(ret))
-		scookie, _ := json.Marshal(retcookie)
-		S.Push(lua.LString(scookie))
-		s.Test_luareqcount++
-		return 2
-	}))
-
-	s.L.SetGlobal("findOneText", s.L.NewFunction(func(S *lua.LState) int {
-		nodetype := S.ToString(-3)
-		gpath := S.ToString(-2)
-		content := S.ToString(-1)
-		ret := util.FindOneText(gpath, content, nodetype)
-		S.Push(ret)
-		return 1
-	}))
-	s.L.SetGlobal("findOneHtml", s.L.NewFunction(func(S *lua.LState) int {
-		nodetype := S.ToString(-3)
-		gpath := S.ToString(-2)
-		content := S.ToString(-1)
-		ret := util.FindOneHtml(gpath, content, nodetype)
-		S.Push(ret)
-		return 1
-	}))
-	s.L.SetGlobal("findListText", s.L.NewFunction(func(S *lua.LState) int {
-		gpath := S.ToString(-2)
-		content := S.ToString(-1)
-		ret := s.L.NewTable()
-		util.FindListText(gpath, content, ret)
-		S.Push(ret)
-		return 1
-	}))
-	s.L.SetGlobal("findListHtml", s.L.NewFunction(func(S *lua.LState) int {
-		gpath := S.ToString(-2)
-		content := S.ToString(-1)
-		ret := s.L.NewTable()
-		util.FindListHtml(gpath, content, ret)
-		S.Push(ret)
-		return 1
-	}))
-	s.L.SetGlobal("findMap", s.L.NewFunction(func(S *lua.LState) int {
-		qmap := S.ToTable(-2)
-		content := S.ToString(-1)
-		ret := s.L.NewTable()
-		util.FindMap(qmap, content, ret)
-		S.Push(ret)
-		return 1
-	}))
-	//调用jsvm
-	s.L.SetGlobal("jsvm", s.L.NewFunction(func(S *lua.LState) int {
-		js := S.ToString(-1)
-		ret := s.L.NewTable()
-		if js == "" {
-			ret.RawSet(lua.LString("val"), lua.LString(""))
-			ret.RawSet(lua.LString("err"), lua.LString("js is null"))
-		} else {
-			rep := util.JsVmPost(util.Config.JsVmUrl, js)
-			ret.RawSet(lua.LString("val"), lua.LString(qu.ObjToString(rep["val"])))
-			ret.RawSet(lua.LString("err"), lua.LString(qu.ObjToString(rep["err"])))
-		}
-		S.Push(ret)
-		return 1
-	}))
-	//指定下载器
-	s.L.SetGlobal("changeDownloader", s.L.NewFunction(func(S *lua.LState) int {
-		s.Downloader = GetOneDownloader()
-		S.Push(lua.LString(s.Downloader))
-		return 1
-	}))
-	//手工延时
-	s.L.SetGlobal("timeSleep", s.L.NewFunction(func(S *lua.LState) int {
-		time.Sleep(1 * time.Second)
-		return 0
-	}))
-	//编码解码
-	s.L.SetGlobal("transCode", s.L.NewFunction(func(S *lua.LState) int {
-		codeType := strings.ToLower(S.ToString(-2))
-		str := S.CheckString(-1)
-		switch codeType {
-		case "unicode":
-			str = strings.Replace(str, "%u", "\\u", -1)
-			str = transUnic(str)
-		case "urlencode_gbk":
-			data, _ := ioutil.ReadAll(transform.NewReader(bytes.NewReader([]byte(str)), simplifiedchinese.GBK.NewEncoder()))
-			l, _ := url.Parse("http://a.com/?" + string(data))
-			tmpstr := l.Query().Encode()
-			if len(tmpstr) > 1 {
-				str = tmpstr[0 : len(tmpstr)-1]
-			} else {
-				str = ""
-			}
-		case "urlencode_utf8":
-			l, _ := url.Parse("http://a.com/?" + str)
-			tmpstr := l.Query().Encode()
-			if len(tmpstr) > 1 {
-				str = tmpstr[0 : len(tmpstr)-1]
-			} else {
-				str = ""
-			}
-		case "urldecode_utf8":
-			str, _ = url.QueryUnescape(str)
-		case "decode64":
-			str = util.DecodeB64(str)
-		case "encodemd5":
-			str = qu.GetMd5String(str)
-		case "htmldecode": //html实体码
-			//txt := `<div align="left" style="margin-left: 0pt;"><span style='font-family:; font-size:13px; color:#000000'>&#22826;&#38451;&#23707;&#29305;&#21220;&#28040;&#38450;&#31449;&#12289;&#26494;&#28006;&#29305;&#21220;&#28040;&#38450;&#31449;&#24314;&#35774;&#39033;&#30446;&#35774;&#35745;&#20013;&#26631;&#20844;&#31034;</span></div>`
-			str = S.ToString(-1)
-			reg, _ := regexp.Compile("&#\\d+;")
-			str = reg.ReplaceAllStringFunc(str, func(src string) string {
-				v, _ := strconv.Atoi(src[2 : len(src)-1])
-				return string(rune(v))
-			})
-		}
-		S.Push(lua.LString(str))
-		return 1
-	}))
-	//保存错误日志
-	s.L.SetGlobal("saveErrLog", s.L.NewFunction(func(S *lua.LState) int {
-
-		return 0
-	}))
-	//添加改版日志
-	s.L.SetGlobal("saveRevisionLog", s.L.NewFunction(func(S *lua.LState) int {
-
-		return 0
-	}))
-	//如果服务端返回的html是gzip压缩过格式的 这里需要转一下
-	s.L.SetGlobal("unGzip", s.L.NewFunction(func(S *lua.LState) int {
-		html := S.ToString(-1)
-		bs := []byte(html)
-		gzipreader, _ := gzip.NewReader(bytes.NewReader(bs))
-		bs, _ = ioutil.ReadAll(gzipreader)
-		S.Push(lua.LString(bs))
-		return 1
-	}))
-
-	s.L.SetGlobal("titleRepeatJudgement", s.L.NewFunction(func(S *lua.LState) int {
-		bResult := false
-		S.Push(lua.LBool(bResult))
-		return 1
-	}))
-
-	//解析附件中的word、pdf
-	s.L.SetGlobal("officeAnalysis", s.L.NewFunction(func(S *lua.LState) int {
-
-		ext := map[string]byte{"pdf": byte(0), "doc": byte(1), "docx": byte(2)}
-
-		str := S.ToString(-2)
-		extension := S.ToString(-1)
-
-		bs, _ := base64.StdEncoding.DecodeString(str)
-		bs = append([]byte{ext[extension]}, bs...)
-		msgid := mu.UUID(8)
-		Msclient.Call("", msgid, mu.SERVICE_OFFICE_ANALYSIS, mu.SENDTO_TYPE_ALL_RECIVER, bs, 60)
-		return 1
-	}))
-	//下载附件download(url,method,param,head,cookie,fileName)
-	s.L.SetGlobal("downloadFile", s.L.NewFunction(func(S *lua.LState) int {
-		cookie := S.ToString(-1)
-		head := S.ToTable(-2)
-		param := S.ToTable(-3)
-		method := S.ToString(-4)
-		url := S.ToString(-5)
-		fileName := S.ToString(-6)
-		ishttps := strings.Contains(url, "https")
-		var mycookie []*http.Cookie
-		if cookie != "{}" {
-			json.Unmarshal([]byte(cookie), &mycookie)
-		} else {
-			mycookie = make([]*http.Cookie, 0)
-		}
-		fileName = strings.TrimSpace(fileName)
-		url = strings.TrimSpace(url)
-		ret := DownloadFile(s.Downloader, url, method, util.GetTable(param), util.GetTable(head), mycookie, s.Encoding, false, ishttps, "", s.Timeout)
-		name, size, ftype, fid := "", "", "", ""
-		qu.Debug(GarbledCodeReg.FindAllString(string(ret), -1), len(ret))
-		if ret == nil || len(ret) < 1024*5 {
-			qu.Debug("下载文件出错!")
-		} else {
-			ftype = qu.GetFileType(ret)
-			if (ftype == "docx" || ftype == "doc") && len(GarbledCodeReg.FindAllString(string(ret), -1)) > 10 {
-				url, name, size, ftype, fid = "附件中含有乱码", "附件中含有乱码", "", "", ""
-			} else {
-				url, name, size, ftype, fid = util.UploadFile(s.SCode, fileName, url, ret)
-			}
-		}
-		if strings.TrimSpace(ftype) == "" {
-			if len(path.Ext(name)) > 0 {
-				ftype = path.Ext(name)[1:]
-			}
-		}
-		S.Push(lua.LString(url))
-		S.Push(lua.LString(name))
-		S.Push(lua.LString(size))
-		S.Push(lua.LString(ftype))
-		S.Push(lua.LString(fid))
-		return 5
-
-	}))
-	//支持正则
-	s.L.SetGlobal("regexp", s.L.NewFunction(func(S *lua.LState) int {
-		index := int(S.ToNumber(-1))
-		regstr := S.ToString(-2)
-		text := S.ToString(-3)
-		reg := regexp.MustCompile(regstr)
-		reps := reg.FindAllStringSubmatchIndex(text, -1)
-		ret := s.L.NewTable()
-		number := 0
-		for _, v := range reps {
-			number++
-			ret.Insert(number, lua.LString(text[v[index]:v[index+1]]))
-		}
-		S.Push(ret)
-		return 1
-	}))
-	//支持替换
-	s.L.SetGlobal("replace", s.L.NewFunction(func(S *lua.LState) int {
-		text := S.ToString(-3)
-		old := S.ToString(-2)
-		repl := S.ToString(-1)
-		text = strings.Replace(text, old, repl, -1)
-		S.Push(lua.LString(text))
-		return 1
-	}))
-	//标题的关键词、排除词过滤
-	s.L.SetGlobal("pagefilterword", s.L.NewFunction(func(S *lua.LState) int {
-		keyWordReg := regexp.MustCompile(util.Config.Word["keyword"])
-		notKeyWordReg := regexp.MustCompile(util.Config.Word["notkeyword"])
-		data := S.ToTable(-1)
-		dataMap := util.TableToMap(data)
-		ret := s.L.NewTable()
-		num := 1
-		for _, v := range dataMap {
-			tmp := v.(map[string]interface{})
-			isOk := false
-			if title := qu.ObjToString(tmp["title"]); title != "" {
-				if keyWordReg.MatchString(title) && !notKeyWordReg.MatchString(title) {
-					isOk = true
-				}
-			}
-			if isOk {
-				ret.Insert(num, util.MapToLuaTable(S, tmp))
-				num++
-			}
-		}
-		S.Push(ret)
-		return 1
-	}))
-	//标题的关键词、排除词过滤
-	s.L.SetGlobal("detailfilterword", s.L.NewFunction(func(S *lua.LState) int {
-		keyWordReg := regexp.MustCompile(util.Config.Word["keyword"])
-		notKeyWordReg := regexp.MustCompile(util.Config.Word["notkeyword"])
-		data := S.ToTable(-1)
-		dataMap := util.TableToMap(data)
-		if title := qu.ObjToString(dataMap["title"]); title != "" {
-			if keyWordReg.MatchString(title) && !notKeyWordReg.MatchString(title) {
-				S.Push(lua.LBool(true))
-				return 1
-			} else {
-				qu.Debug(s.SCode, dataMap["href"], "	title error")
-			}
-		} else {
-			qu.Debug(s.SCode, dataMap["href"], "	title error")
-		}
-		S.Push(lua.LBool(false))
-		return 1
-	}))
-	//detail过滤
-	s.L.SetGlobal("filterdetail", s.L.NewFunction(func(S *lua.LState) int {
-		/*
-			1.长度判断 (特殊处理:详情请访问原网页!;详见原网页;见原网页;无;无相关内容;无正文内容)
-			2.是否含汉字
-		*/
-		reg1 := regexp.MustCompile("(原网页|无|无相关内容|无正文内容|详见附件|见附件)")
-		reg2 := regexp.MustCompile("[\u4e00-\u9fa5]")
-		detail := S.ToString(-1)
-		if reg1.MatchString(detail) {
-			S.Push(lua.LBool(true))
-			return 1
-		}
-		if len([]rune(detail)) < 50 || !reg2.MatchString(detail) {
-			S.Push(lua.LBool(false))
-			return 1
-		}
-		S.Push(lua.LBool(false))
-		return 1
-	}))
-	//匹配汉字
-	s.L.SetGlobal("matchan", s.L.NewFunction(func(S *lua.LState) int {
-		reg1 := regexp.MustCompile("(见附件|详见附件)")
-		reg2 := regexp.MustCompile("[\u4e00-\u9fa5]")
-		detail := S.ToString(-1)
-		detail = reg1.ReplaceAllString(detail, "")
-		ok := reg2.MatchString(detail)
-		S.Push(lua.LBool(ok))
-		return 1
-	}))
-	//aes ecb模式加密
-	s.L.SetGlobal("aesEncryptECB", s.L.NewFunction(func(S *lua.LState) int {
-		origData := S.ToString(-2)
-		key := S.ToString(-1)
-		bytekey := []byte(key)
-		byteorigData := []byte(origData)
-		cipher, _ := aes.NewCipher(generateKey([]byte(bytekey)))
-		length := (len(byteorigData) + aes.BlockSize) / aes.BlockSize
-		plain := make([]byte, length*aes.BlockSize)
-		copy(plain, byteorigData)
-		pad := byte(len(plain) - len(byteorigData))
-		for i := len(byteorigData); i < len(plain); i++ {
-			plain[i] = pad
-		}
-		encrypted := make([]byte, len(plain))
-		// 分组分块加密
-		for bs, be := 0, cipher.BlockSize(); bs <= len(byteorigData); bs, be = bs+cipher.BlockSize(), be+cipher.BlockSize() {
-			cipher.Encrypt(encrypted[bs:be], plain[bs:be])
-		}
-		result := base64.StdEncoding.EncodeToString(encrypted)
-		S.Push(lua.LString(result))
-		return 1
-	}))
-}
-
-//
-func (s *Script) Reload() {
-	s.L.Close()
-	s.LoadScript("", s.ScriptFile)
-}
-
-//unicode转码
-func transUnic(str string) string {
-	buf := bytes.NewBuffer(nil)
-	i, j := 0, len(str)
-	for i < j {
-		x := i + 6
-		if x > j {
-			buf.WriteString(str[i:])
-			break
-		}
-		if str[i] == '\\' && str[i+1] == 'u' {
-			hex := str[i+2 : x]
-			r, err := strconv.ParseUint(hex, 16, 64)
-			if err == nil {
-				buf.WriteRune(rune(r))
-			} else {
-				buf.WriteString(str[i:x])
-			}
-			i = x
-		} else {
-			buf.WriteByte(str[i])
-			i++
-		}
-	}
-	return buf.String()
-}
-
-//取得变量
-func (s *Script) GetVar(key string) string {
-	return s.L.GetGlobal(key).String()
-}
-
-//
-func (s *Script) GetIntVar(key string) int {
-	lv := s.L.GetGlobal(key)
-	if v, ok := lv.(lua.LNumber); ok {
-		return int(v)
-	}
-	return -1
-}
-
-//
-func (s *Script) GetBoolVar(key string) bool {
-	lv := s.L.GetGlobal(key)
-	if v, ok := lv.(lua.LBool); ok {
-		return bool(v)
-	}
-	return false
-}
-
-func generateKey(key []byte) (genKey []byte) {
-	genKey = make([]byte, 16)
-	copy(genKey, key)
-	for i := 16; i < len(key); {
-		for j := 0; j < 16 && i < len(key); j, i = j+1, i+1 {
-			genKey[j] ^= key[i]
-		}
-	}
-	return genKey
-}

+ 0 - 348
spider/service.go

@@ -1,348 +0,0 @@
-// service
-package spider
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	mu "mfw/util"
-	"os"
-	qu "qfw/util"
-	mongodb "qfw/util/mongodb"
-	util "spiderutil"
-	"strings"
-	"time"
-
-	"gopkg.in/mgo.v2/bson"
-)
-
-//获取脚本文件
-func GetScript(code string, str ...interface{}) (script, script_list, script_content string) {
-	defer mu.Catch()
-	//script := ""
-	luaconfig := *mongodb.FindOne("luaconfig", `{"code":"`+code+`"}`)
-	//qu.Debug(code, "lua---", luaconfig)
-	if luaconfig["listcheck"] == nil {
-		luaconfig["listcheck"] = ""
-	}
-	if luaconfig["contentcheck"] == nil {
-		luaconfig["contentcheck"] = ""
-	}
-	if luaconfig != nil && len(luaconfig) > 0 {
-		common := luaconfig["param_common"].([]interface{})
-		if len(str) > 0 {
-			if len(common) == 15 {
-				common = append(common, str[0], str[1], str[2])
-			} else {
-				common = append(common, false, false, str[0], str[1], str[2])
-			}
-		} else {
-			if len(common) == 15 {
-				common = append(common, "", "", "")
-			} else {
-				common = append(common, false, false, "", "", "")
-			}
-		}
-		for k, v := range common {
-			if k == 4 || k == 5 || k == 6 || k == 9 || k == 10 {
-				common[k] = qu.IntAll(v)
-			}
-		}
-
-		script, _ = GetTmpModel(map[string][]interface{}{"common": common})
-		script_time := ""
-		if luaconfig["type_time"] == 0 {
-			time := luaconfig["param_time"].([]interface{})
-			script_time, _ = GetTmpModel(map[string][]interface{}{
-				"time": time,
-			})
-		} else {
-			script_time = luaconfig["str_time"].(string)
-		}
-		//script_list := "" //列表页
-		if luaconfig["type_list"] == 0 {
-			list := luaconfig["param_list"].([]interface{})
-			addrs := strings.Split(list[1].(string), "\n")
-			if len(addrs) > 0 {
-				for k, v := range addrs {
-					addrs[k] = "'" + v + "'"
-				}
-				list[1] = strings.Join(addrs, ",")
-			} else {
-				list[1] = ""
-			}
-			script_list, _ = GetTmpModel(map[string][]interface{}{
-				"list":      list,
-				"listcheck": []interface{}{luaconfig["listcheck"]},
-			})
-		} else {
-			script_list = luaconfig["str_list"].(string)
-		}
-		//script_content := "" //三级页
-		if luaconfig["type_content"] == 0 {
-			content := luaconfig["param_content"].([]interface{})
-			script_content, _ = GetTmpModel(map[string][]interface{}{
-				"content":      content,
-				"contentcheck": []interface{}{luaconfig["contentcheck"]},
-			})
-		} else {
-			script_content = luaconfig["str_content"].(string)
-		}
-		script += fmt.Sprintf(util.Tmp_Other, luaconfig["spidertype"], luaconfig["spiderhistorymaxpage"], luaconfig["spidermovevent"])
-		script += ` 
-			` + script_time + `
-			` + script_list + `
-			` + script_content
-		script = ReplaceModel(script, common, luaconfig["model"].(map[string]interface{}))
-	}
-	return
-}
-
-//保存更新脚本
-func SaveSpider(code string, param map[string]interface{}) bool {
-	return mongodb.Update("luaconfig", bson.M{"code": code}, map[string]interface{}{"$set": param}, true, true)
-}
-
-/*获取最后发布时间
-comm	通用参数
-param	向导参数
-proficient  专家脚本
-guideType 	向导类型
-*/
-func GetLastPublishTime(comm, param []interface{}, proficient, downloadnode string, guideType int, scripts ...int) (timestr interface{}, err interface{}) {
-	defer mu.Catch()
-	var script string
-	if guideType == 0 {
-		script, err = GetTmpModel(map[string][]interface{}{
-			"common": comm,
-			"time":   param,
-		})
-	} else {
-		script, err = GetTmpModel(map[string][]interface{}{
-			"common": comm,
-		})
-		script += proficient
-	}
-	if len(scripts) > 0 {
-		return "", errors.New(script).Error()
-	}
-	if err != nil {
-		return "", err
-	}
-	sp := CreateSpider(downloadnode, script)
-	defer sp.L.Close()
-	timestr, err = sp.GetLastPublishTimeTest()
-	return
-}
-
-/*获取列表信息
-comm		通用参数
-param		向导参数
-model		补充模型
-modeltype	模型类型
-proficient  专家脚本
-guideType 	向导类型
-*/
-func GetPageList(comm, param []interface{}, model map[string]interface{}, listcheck interface{}, proficient, downloadnode string, guideType int, scripts ...int) (list []interface{}, err interface{}) {
-	defer mu.Catch()
-	var script string
-	if guideType == 0 {
-		script, err = GetTmpModel(map[string][]interface{}{
-			"common":    comm,
-			"list":      param,
-			"listcheck": []interface{}{listcheck},
-		})
-		script = ReplaceModel(script, comm, model)
-	} else {
-		script, err = GetTmpModel(map[string][]interface{}{
-			"common": comm,
-		})
-		script += proficient
-	}
-	if len(scripts) > 0 {
-		return nil, errors.New(script).Error()
-	}
-	if err != nil {
-		return nil, err
-	}
-	sp := CreateSpider(downloadnode, script)
-	sp.SpiderMaxPage = 1
-	defer sp.L.Close()
-	list, err = sp.DownListPageItemTest()
-	return
-}
-
-/*获取三级页信息
-comm	通用参数
-param	向导参数
-proficient  专家脚本
-guideType 	向导类型
-*/
-func GetContentInfo(comm, param []interface{}, data map[string]interface{}, contentcheck interface{}, proficient, downloadnode string, guideType int, scripts ...int) (rep map[string]interface{}, err interface{}) {
-	defer mu.Catch()
-	var script string
-	if guideType == 0 {
-		script, err = GetTmpModel(map[string][]interface{}{
-			"common":       comm,
-			"content":      param,
-			"contentcheck": []interface{}{contentcheck},
-		})
-	} else {
-		script, err = GetTmpModel(map[string][]interface{}{
-			"common": comm,
-		})
-		script += proficient
-	}
-	if len(scripts) > 0 {
-		return nil, errors.New(script).Error()
-	}
-	if err != nil {
-		return nil, err
-	}
-	sp := CreateSpider(downloadnode, script)
-	sp.SpiderMaxPage = 1
-	defer sp.L.Close()
-	param2 := map[string]string{}
-	for k, v := range data {
-		param2[k] = fmt.Sprint(v)
-	}
-	rep, err = sp.DownloadDetailPageTest(param2, data)
-	return
-}
-
-//补充模型
-func ReplaceModel(script string, comm []interface{}, model map[string]interface{}) string {
-	//补充通用信息
-	commstr := `item["spidercode"]="` + comm[0].(string) + `";`
-	commstr += `item["site"]="` + comm[1].(string) + `";`
-	commstr += `item["channel"]="` + comm[2].(string) + `";`
-	script = strings.Replace(script, "--Common--", commstr, -1)
-	//补充模型信息
-	modelstr := ""
-	for k, v := range model {
-		modelstr += `item["` + k + `"]="` + v.(string) + `";`
-	}
-	script = strings.Replace(script, "--Model--", modelstr, -1)
-	return script
-}
-
-//创建爬虫
-func CreateSpider(downloadnode, script string, isfile ...string) *Spider {
-	defer mu.Catch()
-	sp := &Spider{}
-	sp.LoadScript(downloadnode, script, isfile...)
-	sp.Code = sp.GetVar("spiderCode")
-	sp.SCode = sp.Code
-	sp.Name = sp.GetVar("spiderName")
-	sp.Channel = sp.GetVar("spiderChannel")
-	sp.DownDetail = sp.GetBoolVar("spiderDownDetailPage")
-	sp.Collection = sp.GetVar("spider2Collection")
-	sp.SpiderStartPage = int64(sp.GetIntVar("spiderStartPage"))
-	sp.SpiderMaxPage = int64(sp.GetIntVar("spiderMaxPage"))
-	sp.SpiderRunRate = int64(sp.GetIntVar("spiderRunRate"))
-	sp.StoreToMsgEvent = sp.GetIntVar("spiderStoreToMsgEvent")
-	sp.StoreMode = sp.GetIntVar("spiderStoreMode")
-	sp.CoverAttr = sp.GetVar("spiderCoverAttr")
-	spiderSleepBase := sp.GetIntVar("spiderSleepBase")
-	if spiderSleepBase == -1 {
-		sp.SleepBase = 1000
-	} else {
-		sp.SleepBase = spiderSleepBase
-	}
-	spiderSleepRand := sp.GetIntVar("spiderSleepRand")
-	if spiderSleepRand == -1 {
-		sp.SleepRand = 1000
-	} else {
-		sp.SleepRand = spiderSleepRand
-	}
-	spiderTimeout := sp.GetIntVar("spiderTimeout")
-	if spiderTimeout == -1 {
-		sp.Timeout = 60
-	} else {
-		sp.Timeout = int64(spiderTimeout)
-	}
-	sp.TargetChannelUrl = sp.GetVar("spiderTargetChannelUrl")
-	sp.SpiderIsHistoricalMend = sp.GetBoolVar("spiderIsHistoricalMend")
-	sp.SpiderIsMustDownload = sp.GetBoolVar("spiderIsMustDownload")
-	//qu.Debug(sp.SpiderIsHistoricalMend, sp.SpiderIsMustDownload)
-	return sp
-}
-
-//生成爬虫脚本
-func GetTmpModel(param map[string][]interface{}) (script string, err interface{}) {
-	qu.Try(func() {
-		if param != nil && param["common"] != nil {
-			if len(param["common"]) < 12 {
-				err = "公共参数配置不全"
-			} else {
-				script = fmt.Sprintf(util.Tmp_common, param["common"]...)
-			}
-		}
-		if param != nil && param["time"] != nil {
-			if len(param["time"]) < 3 {
-				err = "方法:time-参数配置不全"
-			} else {
-				script += fmt.Sprintf(util.Tmp_pubtime, param["time"]...)
-			}
-		}
-		if param != nil && param["list"] != nil {
-			if len(param["list"]) < 7 {
-				err = "方法:list-参数配置不全"
-			} else {
-				list := []interface{}{param["listcheck"][0]}
-				list = append(list, param["list"]...)
-				script += fmt.Sprintf(util.Tmp_pagelist, list...)
-				script = strings.Replace(script, "#pageno#", `"..tostring(pageno).."`, -1)
-			}
-		}
-
-		if param != nil && param["content"] != nil {
-			if len(param["content"]) < 2 {
-				err = "方法:content-参数配置不全"
-			} else {
-				content := []interface{}{param["contentcheck"][0]}
-				content = append(content, param["content"]...)
-				script += fmt.Sprintf(util.Tmp_content, content...)
-			}
-		}
-	}, func(e interface{}) {
-		err = e
-	})
-	return script, err
-}
-
-//生成文件
-func CreateFile(code, script string) (string, error) {
-	filepath := "res/" + time.Now().Format("2006/01/02")
-	err := os.MkdirAll(filepath, 0777)
-	f, err := os.Create(filepath + "/spider_" + code + ".lua")
-	defer f.Close()
-	f.WriteString(script)
-	return filepath, err
-}
-
-//上传脚本
-func UpdateSpiderByCodeState(code, state string, event int) (bool, error) {
-	msgid := mu.UUID(8)
-	data := map[string]interface{}{}
-	data["code"] = code
-	data["state"] = state
-	rep := map[string]interface{}{}
-	var bs []byte
-	var err error
-	if util.Config.Uploadevents[fmt.Sprint(event)] == "bid" { //?
-		bs, err = MsclientBid.Call("", msgid, event, mu.SENDTO_TYPE_ALL_RECIVER, data, 60)
-	} else {
-		bs, err = Msclient.Call("", msgid, event, mu.SENDTO_TYPE_ALL_RECIVER, data, 60)
-	}
-	if err != nil {
-		return false, err
-	} else {
-		json.Unmarshal(bs, &rep)
-		b, _ := rep["b"].(bool)
-		if !b {
-			err = errors.New(qu.ObjToString(rep["err"]))
-		}
-		return b, err
-	}
-}

+ 0 - 9
spider/single_test.go

@@ -1,9 +0,0 @@
-package spider
-
-import (
-	"testing"
-)
-
-func TestCheck(t *testing.T) {
-	CreateSpider("../res/single/spider_zxzbjt.lua", "")
-}

+ 0 - 245
spider/spider.go

@@ -1,245 +0,0 @@
-/**
-爬虫,脚本接口,需要扩展
-*/
-package spider
-
-import (
-	"errors"
-	"math/rand"
-	mu "mfw/util"
-	qu "qfw/util"
-	util "spiderutil"
-	"time"
-
-	"github.com/yuin/gopher-lua"
-)
-
-//爬虫()
-type Spider struct {
-	Script
-	Code                           string //代码
-	Name                           string //站点名称
-	Channel                        string //栏目名称
-	DownDetail                     bool   //是否下载详细页
-	LastPubshTime                  int64  //最后发布时间
-	LastDownloadTime               int64  //最后下载时间
-	SpiderRunRate                  int64  //执行频率
-	ExecuteOk                      bool   //任务执行成功/完成标志
-	Collection                     string //写入表名
-	CoverAttr                      string //判重字段
-	StoreMode                      int    //存储模式
-	StoreToMsgEvent                int    //消息类型
-	SleepBase                      int    //基本延时
-	SleepRand                      int    //随机延时
-	TargetChannelUrl               string //栏目页地址
-	SpiderStartPage, SpiderMaxPage int64  //页码配置
-	SpiderIsHistoricalMend         bool
-	SpiderIsMustDownload           bool
-}
-
-//获取最新时间--作为最后更新时间
-func (s *Spider) GetLastPublishTime() (timestr string, errs interface{}) {
-	defer mu.Catch()
-	s.Test_goreqtime++
-	if err := s.L.CallByParam(lua.P{
-		Fn:      s.L.GetGlobal("getLastPublishTime"),
-		NRet:    1,
-		Protect: true,
-	}); err != nil {
-		errs = err.Error()
-		return "", errs
-	}
-	ret := s.L.Get(-1)
-	s.L.Pop(1)
-	if str, ok := ret.(lua.LString); ok {
-		timestr = string(str)
-	}
-	if s.LastPubshTime < util.ParseDate2Int64(timestr) {
-		//防止发布时间超前
-		if util.ParseDate2Int64(timestr) > time.Now().Unix() {
-			s.LastPubshTime = time.Now().Unix()
-		} else {
-			s.LastPubshTime = util.ParseDate2Int64(timestr)
-		}
-	}
-	timestr = time.Unix(s.LastPubshTime, 0).Format(qu.Date_Full_Layout)
-	return timestr, nil
-}
-
-//获取最新时间--作为最后更新时间
-func (s *Spider) GetLastPublishTimeTest() (timestr interface{}, errs interface{}) {
-	defer mu.Catch()
-	if err := s.L.CallByParam(lua.P{
-		Fn:      s.L.GetGlobal("getLastPublishTime"),
-		NRet:    1,
-		Protect: true,
-	}); err != nil {
-		errs = err.Error()
-		return "", errs
-	}
-	ret := s.L.Get(-1)
-
-	return ret, nil
-}
-
-//下载列表
-func (s *Spider) DownListPageItem() (list []map[string]interface{}, errs interface{}) {
-	defer mu.Catch()
-	s.Test_goreqlist++
-	for ; s.SpiderStartPage <= s.SpiderMaxPage && !s.ExecuteOk; s.SpiderStartPage++ {
-		if err := s.L.CallByParam(lua.P{
-			Fn:      s.L.GetGlobal("downloadAndParseListPage"),
-			NRet:    1,
-			Protect: true,
-		}, lua.LNumber(s.SpiderStartPage)); err != nil {
-			errs = err.Error()
-		}
-		lv := s.L.Get(-1)
-		s.L.Pop(1)
-		if tbl, ok := lv.(*lua.LTable); ok {
-			for i := 1; i <= tbl.Len(); i++ {
-				v := tbl.RawGetInt(i).(*lua.LTable)
-				tmp := util.GetTable(v)
-				if qu.ObjToString(tmp["exit"]) == "true" {
-					break
-				}
-				list = append(list, util.GetTable(v))
-			}
-		}
-	}
-	return list, errs
-}
-
-//下载列表
-func (s *Spider) DownListPageItemTest() (list []interface{}, errs interface{}) {
-	defer mu.Catch()
-	for ; s.SpiderStartPage <= s.SpiderMaxPage && !s.ExecuteOk; s.SpiderStartPage++ {
-		if err := s.L.CallByParam(lua.P{
-			Fn:      s.L.GetGlobal("downloadAndParseListPage"),
-			NRet:    1,
-			Protect: true,
-		}, lua.LNumber(s.SpiderStartPage)); err != nil {
-			errs = err.Error()
-		}
-		lv := s.L.Get(-1)
-		s.L.Pop(1)
-		if tbl, ok := lv.(*lua.LTable); ok {
-			var fors = 0
-			for i := 1; i <= tbl.Len(); i++ {
-				v, ok := tbl.RawGetInt(i).(*lua.LTable)
-				if ok {
-					tmp := util.GetTable(v)
-					if qu.ObjToString(tmp["exit"]) == "true" {
-						break
-					}
-					fors = -1
-					list = append(list, util.GetTable(v))
-				}
-			}
-			if fors == 0 {
-				return []interface{}{util.GetTableEx(tbl)}, errors.New("no")
-			}
-		} else {
-			return []interface{}{lv}, errors.New("no")
-		}
-	}
-	return list, errs
-}
-
-//下载解析内容页
-func (s *Spider) DownloadDetailPage(param map[string]string, data map[string]interface{}) (map[string]interface{}, interface{}) {
-	defer mu.Catch()
-	s.Test_goreqcon++
-	tab := s.L.NewTable()
-	for k, v := range param {
-		tab.RawSet(lua.LString(k), lua.LString(v))
-	}
-	var err error
-	if err = s.L.CallByParam(lua.P{
-		Fn:      s.L.GetGlobal("downloadDetailPage"),
-		NRet:    1,
-		Protect: true,
-	}, tab); err != nil {
-		return data, err
-	}
-	lv := s.L.Get(-1)
-	s.L.Pop(1)
-	//拼map
-	if v3, ok := lv.(*lua.LTable); ok {
-		v3.ForEach(func(k, v lua.LValue) {
-			if tmp, ok := k.(lua.LString); ok {
-				key := string(tmp)
-				if value, ok := v.(lua.LString); ok {
-					data[key] = string(value)
-				} else if value, ok := v.(lua.LNumber); ok {
-					data[key] = value
-				} else if value, ok := v.(*lua.LTable); ok {
-					tmp := util.TableToMap(value)
-					data[key] = tmp
-				}
-			}
-		})
-		return data, err
-	} else {
-		return nil, err
-	}
-}
-
-//下载解析内容页
-func (s *Spider) DownloadDetailPageTest(param map[string]string, data map[string]interface{}) (map[string]interface{}, interface{}) {
-	defer mu.Catch()
-	tab := s.L.NewTable()
-	for k, v := range param {
-		tab.RawSet(lua.LString(k), lua.LString(v))
-	}
-	//co := s.L.NewThread()
-	//co.ScriptFileName = s.L.ScriptFileName
-	//defer co.Close()
-	var err error
-	if err = s.L.CallByParam(lua.P{
-		Fn:      s.L.GetGlobal("downloadDetailPage"),
-		NRet:    1,
-		Protect: true,
-	}, tab); err != nil {
-		return data, err
-	}
-	lv := s.L.Get(-1)
-	s.L.Pop(1)
-	var flag = 0
-	//拼map
-	if v3, ok := lv.(*lua.LTable); ok {
-		v3.ForEach(func(k, v lua.LValue) {
-			if tmp, ok := k.(lua.LString); ok {
-				key := string(tmp)
-				if value, ok := v.(lua.LString); ok {
-					data[key] = string(value)
-				} else if value, ok := v.(lua.LNumber); ok {
-					data[key] = value
-				} else if value, ok := v.(*lua.LTable); ok {
-					tmp := util.TableToMap(value)
-					data[key] = tmp
-				}
-			} else {
-				flag = -1
-				return
-			}
-		})
-		if flag == -1 {
-			return map[string]interface{}{
-				"no": util.GetTableEx(lv.(*lua.LTable)),
-			}, errors.New("no")
-		} else {
-			return data, err
-		}
-	} else {
-		return map[string]interface{}{
-			"no": lv,
-		}, errors.New("no")
-	}
-}
-
-//获取随机数
-func GetRandMath(num int) int {
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	return r.Intn(num)
-}

+ 1 - 1
src/filter/sessfilter.go

@@ -1,9 +1,9 @@
 package filter
 
 import (
-	task "luaweb/taskManager"
 	"net/http"
 	"regexp"
+	task "taskManager"
 
 	"github.com/go-xweb/xweb"
 )

+ 3 - 3
src/front/front.go

@@ -5,18 +5,18 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
-	"luaweb/spider"
-	u "luaweb/util"
 	qu "qfw/util"
 	mgdb "qfw/util/mongodb"
 	"qfw/util/redis"
 	"regexp"
 	"sort"
-	util "spiderutil"
+	"spider"
+	util "spider_util"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
+	u "util"
 
 	"github.com/go-xweb/httpsession"
 	"github.com/go-xweb/xweb"

+ 2 - 2
src/front/luamove.go

@@ -4,12 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"luaweb/spider"
 	"net/http"
 	qu "qfw/util"
 	mgdb "qfw/util/mongodb"
 	"sort"
-	util "spiderutil"
+	"spider"
+	util "spider_util"
 	"strings"
 	"time"
 

+ 3 - 3
src/front/spider.go

@@ -5,18 +5,18 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"luaweb/spider"
 	"sort"
+	"spider"
 
 	//	"math/rand"
-	u "luaweb/util"
 	mu "mfw/util"
 	qu "qfw/util"
 	mgdb "qfw/util/mongodb"
 	mgu "qfw/util/mongodbutil"
-	util "spiderutil"
+	util "spider_util"
 	"strings"
 	"time"
+	u "util"
 
 	"gopkg.in/mgo.v2/bson"
 )

+ 3 - 3
src/luaerrdata/errdata.go

@@ -2,14 +2,14 @@ package luaerrdata
 
 import (
 	"encoding/json"
-	"luaweb/spider"
-	"luaweb/udp"
 	qu "qfw/util"
 	mgdb "qfw/util/mongodb"
 	mgu "qfw/util/mongodbutil"
-	util "spiderutil"
+	"spider"
+	util "spider_util"
 	"strings"
 	"time"
+	"udp"
 
 	"github.com/go-xweb/xweb"
 	"gopkg.in/mgo.v2/bson"

+ 10 - 10
src/main.go

@@ -1,26 +1,26 @@
 package main
 
 import (
-	_ "luaweb/filter"
-	"luaweb/front"
-	"luaweb/quesManager"
-	"luaweb/spider"
+	_ "filter"
+	"front"
+	"quesManager"
+	"spider"
 
 	//. "luaweb/task"
-	"luaweb/luaerrdata"
-	"luaweb/taskManager"
-	"luaweb/tomail"
-	"luaweb/udp"
+	"luaerrdata"
+	"taskManager"
+	"tomail"
+	"udp"
 
-	u "luaweb/util"
 	"net/http"
 	qu "qfw/util"
 	mgdb "qfw/util/mongodb"
 	mgu "qfw/util/mongodbutil"
 	"qfw/util/redis"
+	u "util"
 
 	//"spiderutil"
-	util "spiderutil"
+	util "spider_util"
 	"time"
 
 	"github.com/go-xweb/httpsession"

+ 1 - 1
src/spider/download.go

@@ -13,7 +13,7 @@ import (
 	mu "mfw/util"
 	"net/http"
 	"regexp"
-	util "spiderutil"
+	util "spider_util"
 	"time"
 
 	"github.com/surfer/agent"

+ 1 - 1
src/spider/script.go

@@ -19,7 +19,7 @@ import (
 	"path"
 	qu "qfw/util"
 	"regexp"
-	util "spiderutil"
+	util "spider_util"
 	"strconv"
 	"strings"
 	"time"

+ 1 - 1
src/spider/service.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	qu "qfw/util"
 	mongodb "qfw/util/mongodb"
-	util "spiderutil"
+	util "spider_util"
 	"strings"
 	"time"
 

+ 1 - 1
src/spider/spider.go

@@ -8,7 +8,7 @@ import (
 	"math/rand"
 	mu "mfw/util"
 	qu "qfw/util"
-	util "spiderutil"
+	util "spider_util"
 	"time"
 
 	"github.com/yuin/gopher-lua"

+ 3 - 3
src/taskManager/taskManager.go

@@ -1,16 +1,16 @@
 package taskManager
 
 import (
+	ft "finishtime"
 	"fmt"
+	sp "front"
 	"io/ioutil"
 	"log"
-	ft "luaweb/finishtime"
-	sp "luaweb/front"
 	qu "qfw/util"
 	mgdb "qfw/util/mongodb"
 	mgu "qfw/util/mongodbutil"
 	"sort"
-	util "spiderutil"
+	util "spider_util"
 	"strconv"
 	"strings"
 	"time"

+ 1 - 1
src/tomail/sendmail.go

@@ -8,7 +8,7 @@ import (
 	"net/smtp"
 	"qfw/util"
 	mgdb "qfw/util/mongodb"
-	sp "spiderutil"
+	sp "spider_util"
 	"strconv"
 	"strings"
 	"time"

+ 1 - 1
src/udp/udp.go

@@ -4,7 +4,7 @@ import (
 	mu "mfw/util"
 	"net"
 	qu "qfw/util"
-	sp "spiderutil"
+	sp "spider_util"
 	"sync"
 )
 

+ 1 - 1
src/util/util.go

@@ -5,7 +5,7 @@ import (
 	mgo "mongodb"
 	qu "qfw/util"
 	"regexp"
-	sp "spiderutil"
+	sp "spider_util"
 	"strings"
 	"time"
 

+ 0 - 57
task/flush.go

@@ -1,57 +0,0 @@
-package task
-
-import (
-	"fmt"
-	"luaweb/front"
-	mgdb "qfw/util/mongodb"
-	"time"
-
-	"gopkg.in/mgo.v2/bson"
-)
-
-var timer *time.Ticker
-
-func init() {
-	timer = time.NewTicker(1 * time.Second)
-}
-
-func TimeTask() {
-	for t := range timer.C {
-		hour := t.Hour()
-		second := t.Second()
-		minutes := t.Minute()
-		if hour == 0 && minutes == 0 && second == 0 {
-			FlushAuthor()
-		}
-	}
-}
-
-func FlushAuthor() {
-	query := bson.M{
-		"flush": bson.M{"$exists": false},
-		"next":  bson.M{"$exists": true},
-		"l_uploadtime": bson.M{
-			"$lte": time.Now().AddDate(0, 0, -30).Unix(),
-		},
-		"$where": "this.createuseremail != this.next",
-	}
-	rets := *mgdb.Find("luaconfig", query, bson.M{}, bson.M{}, false, -1, -1)
-	for _, v := range rets {
-		next, ok := v["next"].(string)
-		if ok {
-			one := *mgdb.FindOne("user", bson.M{"s_email": next})
-			if len(one) > 0 {
-				update := bson.M{
-					"$set": bson.M{
-						"createuser":      one["s_name"],
-						"createuserid":    one["_id"].(bson.ObjectId).Hex(),
-						"createuseremail": next,
-						"flush":           "ok",
-					},
-				}
-				front.Wlog("转移爬虫给", v["code"].(string), fmt.Sprint(one["s_name"]), next, "系统定时任务", nil)
-				mgdb.Update("luaconfig", bson.M{"_id": v["_id"]}, update, false, false)
-			}
-		}
-	}
-}

+ 0 - 1241
taskManager/taskManager.go

@@ -1,1241 +0,0 @@
-package taskManager
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	ft "luaweb/finishtime"
-	sp "luaweb/front"
-	qu "qfw/util"
-	mgdb "qfw/util/mongodb"
-	mgu "qfw/util/mongodbutil"
-	"sort"
-	util "spiderutil"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/go-xweb/xweb"
-	"github.com/tealeg/xlsx"
-	"gopkg.in/mgo.v2/bson"
-)
-
-type TaskM struct {
-	*xweb.Action
-	managerTask           xweb.Mapper `xweb:"/center/managerTask"`                //任务管理
-	taskfile              xweb.Mapper `xweb:"/center/taskfile"`                   //任务导入
-	mytask                xweb.Mapper `xweb:"/center/mytask"`                     //我的任务
-	checkCode             xweb.Mapper `xweb:"/center/task/checkCode"`             //检验任务是否存在
-	searchMintainer       xweb.Mapper `xweb:"/center/searchMintainer"`            //查询所有维护人员
-	saveNewTask           xweb.Mapper `xweb:"/center/task/saveNewTask"`           //新建任务
-	editTask              xweb.Mapper `xweb:"/center/task/edit/(.*)"`             //编辑任务
-	updateTask            xweb.Mapper `xweb:"/center/task/updateTask"`            //修改任务
-	updateTaskState       xweb.Mapper `xweb:"/center/task/updateTaskState"`       //修改状态为处理中
-	saveRecord            xweb.Mapper `xweb:"/center/task/saveRecord"`            //保存记录提交审核
-	audit                 xweb.Mapper `xweb:"/center/task/audit"`                 //审核任务
-	assignChangeTaskState xweb.Mapper `xweb:"/center/task/assignChangeTaskState"` //分发任务
-	closeChangeTaskState  xweb.Mapper `xweb:"/center/task/closeChangeTaskState"`  //关闭任务
-	batchAssign           xweb.Mapper `xweb:"/center/task/batchAssign"`           //批量分发任务
-	batchClose            xweb.Mapper `xweb:"/center/task/batchClose"`            //批量关闭任务
-	getJumpMark           xweb.Mapper `xweb:"/center/task/getJumpMark"`           //跳转标记
-	searchErrLog          xweb.Mapper `xweb:"/center/task/searchErrLog"`          //搜索错误日志
-	searchDataInfo        xweb.Mapper `xweb:"/center/task/searchDataInfo"`        //搜索数据的标题和发布时间
-	//del                 xweb.Mapper `xweb:"/center/task/del"`                   //删除任务
-	//searchTask      	  xweb.Mapper `xweb:"/center/task/searchTask"`      	  //查询任务
-
-}
-
-//session是否失效
-var SessionFailuer bool //检测每次登陆
-
-const role_admin, role_examine, role_dev = 3, 2, 1 //管理员,审核员,开发员
-
-//任务导入
-func (t *TaskM) Taskfile() {
-	auth := qu.IntAll(t.GetSession("auth"))
-	if auth != role_admin {
-		t.ServeJson("没有权限")
-		return
-	}
-	if t.Method() == "POST" {
-		mf, _, err := t.GetFile("xlsx")
-		errorinfo := map[string]interface{}{}
-		o := make(map[string]interface{})
-		o["s_date"] = time.Now().Format("2006-01-02")
-		o["s_source"] = "人工"
-		o["s_type"] = "0"
-		var ug string = ""
-		if err == nil {
-			binary, _ := ioutil.ReadAll(mf)
-			xls, _ := xlsx.OpenBinary(binary)
-			sheet := xls.Sheets[0]
-			rows := sheet.Rows
-			for k, v := range rows {
-				if k != 0 {
-					cells := v.Cells
-					if len(cells) == 0 {
-						continue
-					}
-					if cells[0].Value == "" { //没有code
-						continue
-					} else { //有code
-						o["s_code"] = cells[0].Value
-						queryT := bson.M{
-							"s_code": cells[0].Value,
-							"i_state": bson.M{
-								"$in": []int{1, 2, 5},
-							},
-						}
-						task := *mgdb.FindOne("task", queryT)
-						//if len(task) != 0 { //任务已存在 追加描述 并修改紧急度和最迟完成时间
-						//errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行数据已导入"
-						//continue
-						//} else { //任务不存在
-						if len(cells) == 4 && cells[3].Value != "" { //必有code和最终完成时间
-							if cells[1].Value == "" || cells[2].Value == "" { //没有描述或者紧急度
-								errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行数据不完整"
-								continue
-							} else {
-								if !strings.Contains(cells[3].Value, "-") { //日期格式不对
-									errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行日期格式错误"
-									continue
-								} else {
-									if len(task) != 0 { //有该任务 追加描述 比较紧急度和最迟完成时间
-										//追加描述
-										text := time.Now().Format(qu.Date_Short_Layout) + "追加描述:------------------------------\n" + cells[1].Value + "\n"
-										s_descript := task["s_descript"].(string) + text
-										//比较、更新最迟完成时间
-										var l_complete int64
-										var s_urgency string
-										s_urgency = isUrgency(cells)
-										if s_urgency == "0" {
-											errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行紧急度填写错误"
-											continue
-										}
-										timeDate, _ := time.ParseInLocation("2006-01-02", cells[3].Value, time.Local)
-										complete := timeDate.Unix() + 64800
-										taskComplete := qu.Int64All(task["l_complete"])
-										if complete <= taskComplete { //取excel中的最迟完成时间和紧急度
-											l_complete = complete
-										} else { //取task中的最迟完成时间和紧急度
-											l_complete = taskComplete
-											s_urgency = task["s_urgency"].(string)
-										}
-
-										if task["i_state"].(int) == 2 {
-											errorinfo[cells[0].Value] = "任务已存在"
-										}
-										//更新task
-										UpdateOldTask(task["_id"].(bson.ObjectId).Hex(), s_descript, s_urgency, l_complete)
-
-									} else {
-										timeDate, err := time.ParseInLocation("2006-01-02", cells[3].Value, time.Local)
-										if err == nil {
-											o["l_complete"] = timeDate.Unix() + 64800
-										}
-										o["s_descript"] = cells[1].Value + "\n"
-										ug = isUrgency(cells)
-										if ug == "0" {
-											errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行紧急度填写错误"
-											continue
-										}
-										o["s_urgency"] = ug
-									}
-								}
-							}
-						} else if len(cells) == 4 && cells[3].Value == "" { //避免添加最终时间后又手动删除
-							if len(task) != 0 {
-								//追加描述
-								text := time.Now().Format(qu.Date_Short_Layout) + "追加描述:------------------------------\n" + cells[1].Value + "\n"
-								s_descript := task["s_descript"].(string) + text
-								//比较、更新最迟完成时间
-								var l_complete int64
-								var s_urgency string
-								s_urgency = isUrgency(cells)
-								if s_urgency == "0" {
-									errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行紧急度填写错误"
-									continue
-								}
-								complete := ft.CompleteTime(s_urgency)
-								taskComplete := qu.Int64All(task["l_complete"])
-								if complete <= taskComplete { //取excel中的最迟完成时间和紧急度
-									l_complete = complete
-								} else { //取task中的最迟完成时间和紧急度
-									l_complete = taskComplete
-									s_urgency = task["s_urgency"].(string)
-								}
-								if task["i_state"].(int) == 2 {
-									errorinfo[cells[0].Value] = "任务已存在"
-								}
-
-								//更新task
-								UpdateOldTask(task["_id"].(bson.ObjectId).Hex(), s_descript, s_urgency, l_complete)
-							} else {
-								if cells[1].Value != "" {
-									ug = isUrgency(cells)
-									if ug == "0" {
-										errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行紧急度填写错误"
-										continue
-									}
-									o["l_complete"] = ft.CompleteTime(ug)
-									o["s_descript"] = cells[1].Value + "\n"
-									o["s_urgency"] = ug
-								} else {
-									errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行数据不完整"
-								}
-							}
-
-						} else if len(cells) == 3 { //必没有最终完成时间 自动生成
-							if len(task) != 0 {
-								//追加描述
-								text := time.Now().Format(qu.Date_Short_Layout) + "追加描述:------------------------------\n" + cells[1].Value + "\n"
-								s_descript := task["s_descript"].(string) + text
-								//比较、更新最迟完成时间
-								var l_complete int64
-								var s_urgency string
-								s_urgency = isUrgency(cells)
-								if s_urgency == "0" {
-									errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行紧急度填写错误"
-									continue
-								}
-								complete := ft.CompleteTime(s_urgency)
-								taskComplete := qu.Int64All(task["l_complete"])
-								if complete <= taskComplete { //取excel中的最迟完成时间和紧急度
-									l_complete = complete
-								} else { //取task中的最迟完成时间和紧急度
-									l_complete = taskComplete
-									s_urgency = task["s_urgency"].(string)
-								}
-								if task["i_state"].(int) == 2 {
-									errorinfo[cells[0].Value] = "任务已存在"
-								}
-
-								//更新task
-								UpdateOldTask(task["_id"].(bson.ObjectId).Hex(), s_descript, s_urgency, l_complete)
-							} else {
-								if cells[1].Value != "" {
-									ug = isUrgency(cells)
-									if ug == "0" {
-										errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行紧急度填写错误"
-										continue
-									}
-									o["l_complete"] = ft.CompleteTime(ug)
-									o["s_descript"] = cells[1].Value + "\n"
-									o["s_urgency"] = ug
-								} else {
-									errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行数据不完整"
-								}
-							}
-						} else {
-							errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行数据不完整"
-							continue
-						}
-						if len(task) == 0 {
-							queryL := bson.M{"code": cells[0].Value}
-							lua := *mgdb.FindOne("luaconfig", queryL)
-							if lua != nil {
-								param := lua["param_common"]
-								o["s_site"] = param.([]interface{})[1] //取数组中的某个值
-								o["s_channel"] = param.([]interface{})[2]
-								o["i_state"] = 1
-								o["s_modify"] = lua["createuser"]
-								o["s_modifyid"] = lua["createuserid"]
-								o["l_comeintime"] = time.Now().Unix()
-								o["i_event"] = lua["event"]
-								o["i_times"] = 0
-							} else {
-								errorinfo[cells[0].Value] = "第" + strconv.Itoa(k+1) + "行爬虫代码填写错误"
-								continue
-							}
-							mgdb.Save("task", o)
-							//清空map
-							o = map[string]interface{}{}
-						}
-						//}
-					}
-				}
-			}
-			t.ServeJson(errorinfo)
-		} else {
-			t.ServeJson(false)
-		}
-	}
-}
-
-func (t *TaskM) ManagerTask() {
-	auth := qu.IntAll(t.GetSession("auth"))
-	urgency, _ := t.GetInteger("state")       //紧急程度
-	taskState, _ := t.GetInteger("taskState") //任务状态
-	event, _ := t.GetInteger("taskEvent")     //节点
-	stype, _ := t.GetInteger("taskStype")     //任务类型
-	searchStr := t.GetString("search[value]")
-	//search := strings.Replace(searchStr, " ", "", -1)
-	search := strings.TrimSpace(searchStr)
-	draw, _ := t.GetInteger("draw")
-	start, _ := t.GetInteger("start")
-	limit, _ := t.GetInteger("length")
-	if auth == role_admin {
-		if t.Method() == "GET" {
-			events := []string{}
-			for k, _ := range util.Config.Uploadevents {
-				events = append(events, k)
-			}
-			sort.Strings(events)
-			t.T["events"] = events
-			t.Render("task.html", &t.T)
-		} else {
-			query := queryCriteria(urgency, taskState, event, stype)
-			if search != "" {
-				query["$or"] = []interface{}{
-					bson.M{"s_code": bson.M{"$regex": search}},
-					bson.M{"s_modify": bson.M{"$regex": search}},
-					bson.M{"s_site": bson.M{"$regex": search}},
-					bson.M{"s_channel": bson.M{"$regex": search}},
-				}
-			}
-			sort := `{"%s":%d}`
-			orderIndex := t.GetString("order[0][column]")
-			orderName := t.GetString(fmt.Sprintf("columns[%s][data]", orderIndex))
-			orderType := 1
-			if t.GetString("order[0][dir]") != "asc" {
-				orderType = -1
-			}
-			sort = fmt.Sprintf(sort, orderName, orderType)
-			if orderIndex == "9" { //按下载/下限排序时 先按完成时间排序
-				sorta := strings.Replace(sort, "{", "", -1)
-				sortb := strings.Replace(sorta, "}", "", -1)
-				//sort = `{"l_complete":1,` + sortb + `}`
-				sort = `{` + sortb + `,"l_complete":1}`
-			}
-			task := *mgdb.Find("task", query, sort, nil, false, start, limit)
-			count := mgdb.Count("task", query)
-			page := start / 10
-			if len(task) > 0 {
-				for k, v := range task {
-					// if v["f_num"] == nil {
-					// 	v["f_num"] = 0
-					// }
-					// if v["f_min"] == nil {
-					// 	v["f_min"] = 0
-					// }
-					// if v["i_minNum"] == nil {
-					// 	v["i_minNum"] = 0
-					// }
-					v["num"] = k + 1 + page*10
-					v["encode"] = util.Se.Encode2Hex(fmt.Sprint(v["s_code"]))
-					s_urgency := qu.IntAll(v["s_urgency"])
-					if s_urgency == 1 {
-						v["s_urgency"] = "普通"
-					} else if s_urgency == 2 {
-						v["s_urgency"] = "紧急"
-					} else if s_urgency == 3 {
-						v["s_urgency"] = "非常紧急"
-					} else if s_urgency == 4 {
-						v["s_urgency"] = "特别紧急"
-					}
-
-					if v["i_state"] == 0 {
-						v["i_state"] = "待确认"
-					} else if v["i_state"] == 1 {
-						v["i_state"] = "待处理"
-					} else if v["i_state"] == 2 {
-						v["i_state"] = "处理中"
-					} else if v["i_state"] == 3 {
-						v["i_state"] = "待审核"
-					} else if v["i_state"] == 4 {
-						v["i_state"] = "审核通过"
-					} else if v["i_state"] == 5 {
-						v["i_state"] = "未通过"
-					} else if v["i_state"] == 6 {
-						v["i_state"] = "关闭"
-					}
-					if v["i_event"] == nil { //节点
-						v["i_event"] = 0
-					}
-					//					if v["continueTimes"] == nil { //特别紧急任务连续报错次数
-					//						v["continueTimes"] = 0
-					//					} else {
-					//						for _, times := range v["continueTimes"].(map[string]interface{}) {
-					//							v["continueTimes"] = times
-					//						}
-					//					}
-					l_complete := qu.Int64All(v["l_complete"])
-					v["l_complete"] = qu.FormatDateByInt64(&l_complete, qu.Date_Full_Layout)
-					//v["l_complete"] = time.Unix(v["l_complete"].(int64), 0).Format("2006-01-02 15:04:05")
-					v["_id"] = v["_id"].(bson.ObjectId).Hex()
-					//根据code查询luaconfig
-					param := findLua(v["s_code"].(string))
-					if len(param) < 13 || param == nil {
-						v["href"] = "javascript:void(0)"
-					} else {
-						v["href"] = param[11]
-					}
-				}
-			}
-			t.ServeJson(map[string]interface{}{"draw": draw, "data": task, "recordsFiltered": count, "recordsTotal": count})
-		}
-	} else {
-		t.Write("您没有导入任务的权限")
-	}
-}
-
-func findLua(code string) []interface{} {
-	lua := *mgdb.FindOneByField("luaconfig", `{"code":"`+code+`"}`, `{"param_common":1}`)
-	param := lua["param_common"].([]interface{})
-	return param
-}
-
-//我的任务
-func (t *TaskM) Mytask() {
-	auth := qu.IntAll(t.GetSession("auth"))
-	if auth != role_dev {
-		t.ServeJson("没有权限")
-		return
-	}
-	userid := t.GetSession("userid")
-	query := bson.M{}
-	if t.Method() == "POST" {
-		start, _ := t.GetInteger("start")
-		limit, _ := t.GetInteger("length")
-		draw, _ := t.GetInteger("draw")
-		//state, _ := t.GetInteger("state")
-		urgency, _ := t.GetInteger("state")
-		taskState, _ := t.GetInteger("taskState")
-		stype, _ := t.GetInteger("taskStype") //任务类型
-		event, _ := t.GetInteger("taskEvent") //节点
-		searchStr := t.GetString("search[value]")
-		//search := strings.Replace(searchStr, " ", "", -1)
-		search := strings.TrimSpace(searchStr)
-		//查询自己的任务
-		query = queryCriteria(urgency, taskState, event, stype)
-		query["s_modifyid"] = userid
-
-		if search != "" {
-			query["$or"] = []interface{}{
-				bson.M{"s_code": bson.M{"$regex": search}},
-				bson.M{"s_site": bson.M{"$regex": search}},
-				bson.M{"s_channel": bson.M{"$regex": search}},
-			}
-		}
-		sort := `{"%s":%d}`
-		orderIndex := t.GetString("order[0][column]")
-		orderName := t.GetString(fmt.Sprintf("columns[%s][data]", orderIndex))
-		orderType := 1
-		if t.GetString("order[0][dir]") != "asc" {
-			orderType = -1
-		}
-
-		sort = fmt.Sprintf(sort, orderName, orderType)
-		// sorta := strings.Replace(sort, "{", "", -1)
-		// sortb := strings.Replace(sorta, "}", "", -1)
-		// sortNew := `{"l_complete": 1,` + sortb + `}`
-		task := *mgdb.Find("task", query, sort, nil, false, start, limit)
-		count := mgdb.Count("task", query)
-		if task != nil {
-			for _, v := range task {
-				v["encode"] = util.Se.Encode2Hex(fmt.Sprint(v["s_code"]))
-				if v["s_urgency"] == "1" {
-					v["s_urgency"] = "普通"
-				} else if v["s_urgency"] == "2" {
-					v["s_urgency"] = "紧急"
-				} else if v["s_urgency"] == "3" {
-					v["s_urgency"] = "非常紧急"
-				} else if v["s_urgency"] == "4" {
-					v["s_urgency"] = "特别紧急"
-				}
-
-				if v["i_state"] == 0 {
-					v["i_state"] = "待确认"
-				} else if v["i_state"] == 1 {
-					v["i_state"] = "待处理"
-				} else if v["i_state"] == 2 {
-					v["i_state"] = "处理中"
-				} else if v["i_state"] == 3 {
-					v["i_state"] = "待审核"
-				} else if v["i_state"] == 4 {
-					v["i_state"] = "审核通过"
-				} else if v["i_state"] == 5 {
-					v["i_state"] = "未通过"
-				} else if v["i_state"] == 6 {
-					v["i_state"] = "关闭"
-				}
-				if v["i_event"] == nil { //节点
-					v["i_event"] = 0
-				}
-
-				v["l_complete"] = time.Unix(v["l_complete"].(int64), 0).Format("2006-01-02 15:04:05")
-				v["_id"] = v["_id"].(bson.ObjectId).Hex()
-			}
-		}
-		t.ServeJson(map[string]interface{}{"draw": draw, "data": task, "recordsFiltered": count, "recordsTotal": count})
-	} else {
-		events := []string{}
-		for k, _ := range util.Config.Uploadevents {
-			events = append(events, k)
-		}
-		sort.Strings(events)
-		t.T["events"] = events
-
-		failedtasknum := 0
-		if SessionFailuer {
-			query["s_modifyid"] = userid
-			query["i_state"] = 5
-			task := *mgdb.Find("task", query, nil, nil, false, -1, -1)
-			failedtasknum = len(task)
-			SessionFailuer = false
-		}
-		t.T["failedtasknum"] = failedtasknum
-		t.Render("mytask.html", &t.T)
-	}
-}
-
-//检验任务是否存在
-func (t *TaskM) CheckCode() {
-	code := t.GetString("code")
-	status := "notHasCode"
-	var lua map[string]interface{}
-	if code != "" {
-		query := bson.M{
-			"s_code": code,
-			"i_state": bson.M{
-				"$in": []int{1, 2, 5},
-			},
-		}
-		task := *mgdb.FindOne("task", query)
-		if task != nil {
-			task["l_complete"] = time.Unix(task["l_complete"].(int64), 0).Format("2006-01-02 15:04:05")
-			status = "hasCode"
-		} else {
-			luaQuery := bson.M{
-				"code": code,
-			}
-			lua = *mgdb.FindOne("luaconfig", luaQuery)
-		}
-		t.ServeJson(map[string]interface{}{
-			"status": status,
-			"task":   task,
-			"lua":    lua,
-		})
-	}
-}
-
-//查询维护人员
-func (t *TaskM) SearchMintainer() {
-	query := bson.M{
-		"i_auth": 1,
-	}
-
-	mintainer := *mgdb.Find("user", query, nil, nil, false, -1, -1)
-	if len(mintainer) > 0 {
-		t.SetSession("mintainer", mintainer)
-		t.ServeJson(map[string]interface{}{
-			"mintainer": mintainer,
-		})
-	} else {
-		log.Println("查询维护人员名单错误")
-	}
-}
-
-//保存新建任务
-func (t *TaskM) SaveNewTask() {
-	auth := qu.IntAll(t.GetSession("auth"))
-	if auth != role_admin {
-		t.ServeJson("没有权限")
-		return
-	}
-	site := t.GetString("site")
-	code := t.GetString("code")
-	channel := t.GetString("channel")
-	modify := t.GetString("modify")
-	descript := t.GetString("descript")
-	urgency := t.GetString("urgency")
-	complete := t.GetString("complete")
-	comeintime := time.Now().Unix()
-	var ug string = ""
-	newTask := make(map[string]interface{})
-	newTask["s_source"] = "人工"
-	newTask["s_type"] = "0"
-	newTask["s_site"] = site             //站点
-	newTask["s_channel"] = channel       //栏目
-	newTask["s_code"] = code             //代码
-	newTask["i_state"] = 1               //完成状态
-	newTask["l_comeintime"] = comeintime //创建时间
-	newTask["s_date"] = time.Now().Format("2006-01-02")
-	newTask["i_times"] = 0
-	queryL := bson.M{
-		"code": code,
-	}
-	lua := *mgdb.FindOne("luaconfig", queryL)
-	if lua != nil {
-		newTask["s_modifyid"] = lua["createuserid"] //维护人员id
-		newTask["i_event"] = lua["event"]           //节点
-	}
-	newTask["s_modify"] = modify     //维护人员
-	newTask["s_descript"] = descript //描述
-	if urgency == "普通" {
-		ug = "1"
-		newTask["s_urgency"] = "1" //紧急度
-	} else if urgency == "紧急" {
-		ug = "2"
-		newTask["s_urgency"] = "2"
-	} else if urgency == "非常紧急" {
-		ug = "3"
-		newTask["s_urgency"] = "3"
-	} else if urgency == "特别紧急" {
-		ug = "4"
-		newTask["s_urgency"] = "4"
-	}
-
-	//根据紧急度自动生成最终完成时间
-	if complete == "" {
-		//newTask["l_complete"] = ft.LastTime(timeHour) //最迟完成时间
-		newTask["l_complete"] = ft.CompleteTime(ug)
-	} else { //转成时间戳
-		timeDate, err := time.ParseInLocation("2006-01-02 15:04:05", complete, time.Local)
-		if err == nil {
-			newTask["l_complete"] = timeDate.Unix()
-		}
-	}
-	task := mgdb.Save("task", newTask)
-	if task != "" {
-		t.ServeJson(map[string]interface{}{
-			"state": "ok",
-		})
-	}
-}
-
-//编辑 查看任务
-func (t *TaskM) EditTask(ids string) error {
-	auth := t.GetSession("auth")
-	//code := strings.Split(codes, "__")[0]
-	id := strings.Split(ids, "__")[0]
-	param := strings.Split(ids, "__")[1]
-	if t.Method() == "GET" {
-		query := bson.M{
-			//"s_code": util.Se.Decode4Hex(code),
-			"_id": bson.ObjectIdHex(id),
-		}
-		task := *mgdb.FindOne("task", query)
-		if task != nil {
-			task["l_comeintime"] = time.Unix(task["l_comeintime"].(int64), 0).Format("2006-01-02 15:04:05")
-			task["l_complete"] = time.Unix(task["l_complete"].(int64), 0).Format("2006-01-02 15:04:05")
-			if task["a_mrecord"] != nil {
-				mrecord := qu.ObjArrToMapArr(task["a_mrecord"].([]interface{}))
-				if mrecord != nil && len(mrecord) > 0 {
-					for _, v := range mrecord {
-						v["l_mrecord_comeintime"] = time.Unix(qu.Int64All(v["l_mrecord_comeintime"]), 0).Format("2006-01-02 15:04:05")
-						v["l_mrecord_complete"] = time.Unix(qu.Int64All(v["l_mrecord_complete"]), 0).Format("2006-01-02 15:04:05")
-					}
-				}
-			}
-			if task["a_check"] != nil {
-				check := qu.ObjArrToMapArr(task["a_check"].([]interface{}))
-				if check != nil && len(check) > 0 {
-					for _, v := range check {
-						v["l_check_checkTime"] = time.Unix(qu.Int64All(v["l_check_checkTime"]), 0).Format("2006-01-02 15:04:05")
-					}
-				}
-			}
-			t.T["encode"] = util.Se.Encode2Hex(fmt.Sprint(task["s_code"]))
-			t.T["id"] = id
-			t.T["task"] = task
-			t.T["param"] = param
-			if t.GetSession(id) == "" || t.GetSession(id) == nil {
-				t.T["xgTime"] = time.Unix(time.Now().Unix(), 0).Format("2006-01-02 15:04:05")
-			} else {
-				t.T["xgTime"] = qu.ObjToString(t.GetSession(id))
-			}
-			t.DelSession(id)
-			if auth == 3 {
-				return t.Render("taskedit.html", &t.T)
-			} else if auth == 1 {
-				return t.Render("mytaskedit.html", &t.T)
-			} else if auth == 2 {
-				return t.Render("auditedit.html", &t.T)
-			}
-		}
-	}
-	return nil
-}
-
-//删除任务
-func (t *TaskM) Del() {
-	auth := qu.IntAll(t.GetSession("auth"))
-	id := t.GetString("id")
-	state := "no"
-	if auth != role_admin {
-		t.ServeJson("没有权限")
-		return
-	}
-	del := bson.M{
-		"_id": bson.ObjectIdHex(id),
-	}
-	ok := mgdb.Del("task", del)
-	if ok {
-		state = "ok"
-	}
-	t.ServeJson(map[string]interface{}{
-		"state": state,
-	})
-}
-
-//修改任务
-func (t *TaskM) UpdateTask() {
-	auth := qu.IntAll(t.GetSession("auth"))
-	if auth != role_admin {
-		t.ServeJson("没有权限")
-		return
-	}
-	modify := t.GetString("modify")
-	id := t.GetString("id")
-	descript := t.GetString("descript")
-	urgency := t.GetString("urgency")
-	complete := t.GetString("complete")
-	completeChange := t.GetString("completeChange")
-	urgencyChange := t.GetString("urgencyChange")
-	var l_complete int64
-	var state = "no"
-	if "普通" == urgency {
-		urgency = "1"
-	} else if "紧急" == urgency {
-		urgency = "2"
-	} else if "非常紧急" == urgency {
-		urgency = "3"
-	} else if "特别紧急" == urgency {
-		urgency = "4"
-	}
-
-	if "no" == completeChange { //时间格式未改变
-		completeTime, _ := time.ParseInLocation("2006-01-02  15:04:05", complete, time.Local)
-		l_complete = completeTime.Unix()
-	} else if "yes" == completeChange { //时间格式改变
-		timeDate, err := time.ParseInLocation("2006-01-02", complete, time.Local)
-		if err == nil {
-			l_complete = timeDate.Unix() + 64800
-		}
-	}
-
-	if "yes" == urgencyChange { //紧急度改变 根据紧急度修改最迟完成时间
-		l_complete = ft.CompleteTime(urgency)
-	}
-
-	queryU := bson.M{
-		"s_name": modify,
-	}
-	task := *mgdb.FindOne("user", queryU)
-	queryT := bson.M{
-		"_id": bson.ObjectIdHex(id),
-	}
-	update := bson.M{
-		"$set": bson.M{
-			"s_modify":   modify,
-			"s_descript": descript,
-			"s_urgency":  urgency,
-			"l_complete": l_complete,
-			"s_modifyid": task["_id"].(bson.ObjectId).Hex(),
-		},
-	}
-	ok := mgdb.Update("task", queryT, update, false, false)
-	if ok {
-		state = "ok"
-		t.SetSession("jumpMark", "y")
-	}
-	t.ServeJson(map[string]interface{}{
-		"state": state,
-	})
-}
-
-//修改任务状态为处理中
-func (t *TaskM) UpdateTaskState() {
-	xgTime := time.Unix(time.Now().Unix(), 0).Format("2006-01-02 15:04:05")
-	//判断之前是否已有
-	id := t.GetString("id")
-	if t.GetSession(id) == nil {
-		t.SetSession(id, xgTime)
-	}
-	query := bson.M{
-		"_id": bson.ObjectIdHex(id),
-	}
-	task := *mgdb.FindOne("task", query)
-	updateOk := false
-	if len(task) > 0 {
-		state := qu.IntAll(task["i_state"])
-		if state == 1 { //修改任务状态为待处理
-			update := bson.M{
-				"$set": bson.M{
-					"i_state": 2,
-				},
-			}
-			updateOk = mgdb.Update("task", query, update, false, false) //更新任务状态
-			code := qu.ObjToString(task["s_code"])
-			mgdb.Update("luaconfig", map[string]interface{}{"code": code}, map[string]interface{}{"$set": map[string]interface{}{"ismodify": true}}, false, false)
-			// code := qu.ObjToString(task["s_code"])
-			// lua := *mgdb.FindOne("luaconfig", map[string]interface{}{"code": code})
-			// if len(lua) > 0 {
-			// 	lua_state := qu.IntAll(lua["state"])
-			// 	if lua_state == sp.Sp_state_5 {
-			// 		b, err := sp.UpStateAndUpSpider(code, "", "", "", sp.Sp_state_6) //点击修改爬虫时,线上爬虫下架
-			// 		if b && err == nil {                                             //下架成功
-			// 			log.Println("爬虫下架成功", code, ",任务id:", id)
-			// 			ok := mgdb.Update("task", query, update, false, false) //更新任务状态
-			// 			if ok {
-			// 				updateOk = true
-			// 			}
-			// 		} else {
-			// 			log.Println("修改任务失败", id)
-			// 		}
-			// 	} else {
-			// 		ok := mgdb.Update("task", query, update, false, false) //更新任务状态
-			// 		if ok {
-			// 			updateOk = true
-			// 		}
-			// 	}
-			// }
-		} else {
-			updateOk = true
-		}
-	}
-	t.ServeJson(map[string]interface{}{
-		"state": updateOk,
-	})
-}
-
-//保存记录
-func (t *TaskM) SaveRecord() {
-	auth := qu.IntAll(t.GetSession("auth"))
-	if auth != role_dev {
-		t.ServeJson("没有权限")
-		return
-	}
-	state := "no"
-	id := t.GetString("id")
-	startTime := t.GetString("startTime")
-	endTime := t.GetString("endTime")
-	remark := t.GetString("remark")
-	query := bson.M{
-		"_id": bson.ObjectIdHex(id),
-	}
-	task := *mgdb.FindOne("task", query)
-	mrecordData := task["a_mrecord"]
-	var mreArr []map[string]interface{}
-	newData := make(map[string]interface{})
-
-	comeintime, _ := time.ParseInLocation("2006-01-02  15:04:05", startTime, time.Local)
-	l_comeintime := comeintime.Unix()
-	completeTime, _ := time.ParseInLocation("2006-01-02  15:04:05", endTime, time.Local)
-	l_complete := completeTime.Unix()
-
-	newData["l_mrecord_comeintime"] = l_comeintime
-	newData["l_mrecord_complete"] = l_complete
-	newData["s_mrecord_remark"] = remark
-	if mrecordData != nil {
-		myArr := qu.ObjArrToMapArr(mrecordData.([]interface{}))
-		if myArr != nil && len(myArr) > 0 {
-			for _, v := range myArr {
-				mreArr = append(mreArr, v)
-			}
-		}
-	}
-	mreArr = append(mreArr, newData)
-	task["a_mrecord"] = mreArr
-	//保存记录
-	ok := mgdb.Update("task", query, map[string]interface{}{
-		"$set": task,
-	}, false, false)
-	var codeArr = []string{id}
-	if ok {
-		//修改状态
-		sp.UpTaskState(codeArr, 1, "", int64(0))
-		state = "yes"
-	}
-	t.ServeJson(map[string]interface{}{
-		"state": state,
-	})
-}
-
-//审核任务
-func (t *TaskM) Audit() {
-	auth := qu.IntAll(t.GetSession("auth"))
-	if auth != role_examine {
-		t.ServeJson("没有权限")
-		return
-	}
-	if t.Method() == "POST" {
-		start, _ := t.GetInteger("start")
-		limit, _ := t.GetInteger("length")
-		draw, _ := t.GetInteger("draw")
-		state, _ := t.GetInteger("state") //紧急程度
-		taskState, _ := t.GetInteger("taskState")
-		searchStr := t.GetString("search[value]")
-		//search := strings.Replace(searchStr, " ", "", -1)
-		search := strings.TrimSpace(searchStr)
-		//查询自己的任务
-		query := bson.M{}
-		query = bson.M{
-			"i_state": bson.M{
-				"$gte": 3,
-				"$lte": 5,
-			},
-		}
-		if state >= 0 && taskState >= 0 {
-			query = bson.M{
-				"s_urgency": strconv.Itoa(state),
-				"i_state":   taskState,
-			}
-		} else if state < 0 && taskState >= 0 {
-			query = bson.M{
-				"i_state": taskState,
-			}
-		} else if state >= 0 && taskState < 0 {
-			query = bson.M{
-				"s_urgency": strconv.Itoa(state),
-				"i_state": bson.M{
-					"$gte": 3,
-					"$lte": 5,
-				},
-			}
-		}
-		if search != "" {
-			query["$or"] = []interface{}{
-				bson.M{"s_code": bson.M{"$regex": search}},
-				bson.M{"s_site": bson.M{"$regex": search}},
-				bson.M{"s_channel": bson.M{"$regex": search}},
-			}
-		}
-		sort := `{"%s":%d}`
-		orderIndex := t.GetString("order[0][column]")
-		orderName := t.GetString(fmt.Sprintf("columns[%s][data]", orderIndex))
-		orderType := 1
-		if t.GetString("order[0][dir]") != "asc" {
-			orderType = -1
-		}
-
-		sort = fmt.Sprintf(sort, orderName, orderType)
-		sorta := strings.Replace(sort, "{", "", -1)
-		sortb := strings.Replace(sorta, "}", "", -1)
-		sortNew := `{"l_complete": 1,` + sortb + `}`
-		task := *mgdb.Find("task", query, sortNew, nil, false, start, limit)
-		count := mgdb.Count("task", query)
-		if task != nil {
-			for _, v := range task {
-				v["encode"] = util.Se.Encode2Hex(fmt.Sprint(v["s_code"]))
-				if v["s_urgency"] == "1" {
-					v["s_urgency"] = "普通"
-				} else if v["s_urgency"] == "2" {
-					v["s_urgency"] = "紧急"
-				} else if v["s_urgency"] == "3" {
-					v["s_urgency"] = "非常紧急"
-				} else if v["s_urgency"] == "4" {
-					v["s_urgency"] = "特别紧急"
-				}
-
-				if v["i_state"] == 0 {
-					v["i_state"] = "待确认"
-				} else if v["i_state"] == 1 {
-					v["i_state"] = "待处理"
-				} else if v["i_state"] == 2 {
-					v["i_state"] = "处理中"
-				} else if v["i_state"] == 3 {
-					v["i_state"] = "待审核"
-				} else if v["i_state"] == 4 {
-					v["i_state"] = "审核通过"
-				} else if v["i_state"] == 5 {
-					v["i_state"] = "未通过"
-				} else if v["i_state"] == 6 {
-					v["i_state"] = "关闭"
-				}
-
-				v["l_complete"] = time.Unix(v["l_complete"].(int64), 0).Format("2006-01-02 15:04:05")
-				v["_id"] = v["_id"].(bson.ObjectId).Hex()
-			}
-		}
-
-		t.ServeJson(map[string]interface{}{"draw": draw, "data": task, "recordsFiltered": count, "recordsTotal": count})
-	} else {
-		t.Render("audit.html")
-	}
-}
-
-//判断紧急度
-func isUrgency(cells []*xlsx.Cell) string {
-	ug := "0"
-	if cells[2].Value == "普通" { //不紧急
-		ug = "1" //5天
-	} else if cells[2].Value == "紧急" {
-		ug = "2" //2天
-	} else if cells[2].Value == "非常紧急" {
-		ug = "3" //6小时
-	} else if cells[2].Value == "特别紧急" { //非常紧急
-		ug = "4" //2小时
-	}
-	return ug
-}
-
-//更新task
-func UpdateOldTask(id, descript, urgency string, complete int64) {
-	queryT := bson.M{
-		"_id": bson.ObjectIdHex(id),
-	}
-	update := bson.M{
-		"$set": bson.M{
-			"s_descript":   descript,
-			"s_urgency":    urgency,
-			"l_complete":   complete,
-			"l_comeintime": time.Now().Unix(),
-		},
-	}
-	ok := mgdb.Update("task", queryT, update, false, false)
-	if ok {
-		log.Println("更新已有任务成功")
-	} else {
-		log.Println("更新已有任务失败")
-	}
-
-}
-
-//分发任务
-func (t *TaskM) AssignChangeTaskState() {
-	id := t.GetString("id")
-	code := t.GetString("code")
-	auth := qu.IntAll(t.GetSession("auth"))
-	if auth == role_admin {
-		//先根据code查有没有相关任务,再根据id修改任务状态
-		query := bson.M{
-			"s_code": code,
-			"i_state": bson.M{
-				"$in": []int{1, 2, 3, 5},
-			},
-		}
-		task := *mgdb.FindOne("task", query)
-		if len(task) > 0 { //有相关任务不能分发
-			t.ServeJson("e")
-			return
-		}
-		//没有相关任务,修改状态
-		query = bson.M{
-			"_id": bson.ObjectIdHex(id),
-		}
-		update := bson.M{
-			"$set": bson.M{
-				"i_state": 1,
-			},
-		}
-		flag := mgdb.Update("task", query, update, false, false)
-		if flag {
-			t.ServeJson("y")
-			t.SetSession("jumpMark", "y")
-		} else {
-			t.ServeJson("n")
-		}
-	} else {
-		t.ServeJson("没有权限")
-	}
-
-}
-
-//关闭任务
-func (t *TaskM) CloseChangeTaskState() {
-	id := t.GetString("id")
-	code := t.GetString("code")
-	auth := qu.IntAll(t.GetSession("auth"))
-	if auth == role_admin {
-		//根据id关闭任务
-		query := bson.M{
-			"_id": bson.ObjectIdHex(id),
-		}
-		update := bson.M{
-			"$set": bson.M{
-				"i_state": 6,
-			},
-		}
-		flag := mgdb.Update("task", query, update, false, false)
-		if flag {
-			go updateClose(code) //更新closerate数据
-			t.ServeJson("y")
-			t.SetSession("jumpMark", "y")
-		} else {
-			t.ServeJson("n")
-		}
-	} else {
-		t.ServeJson("没有权限")
-	}
-
-}
-
-//批量分发任务
-func (t *TaskM) BatchAssign() {
-	ids := strings.Split(t.GetString("ids"), ",")
-	codes := strings.Split(t.GetString("codes"), ",")
-	auth := qu.IntAll(t.GetSession("auth"))
-	query := bson.M{}
-	var existCode []string
-	if auth == role_admin {
-		for k, code := range codes {
-			query = bson.M{
-				"s_code": code,
-				"i_state": bson.M{
-					"$in": []int{1, 2, 3, 5},
-				},
-			}
-			task := *mgdb.FindOne("task", query)
-			//log.Println("task", task)
-			if len(task) > 0 { //任务已经存在
-				existCode = append(existCode, code)
-			} else {
-				id := ids[k]
-				query = bson.M{
-					"_id": bson.ObjectIdHex(id),
-				}
-				update := bson.M{
-					"$set": bson.M{
-						"i_state": 1,
-					},
-				}
-				flag := mgdb.Update("task", query, update, false, false)
-				log.Println("任务id:", id, "	更新:", flag)
-			}
-		}
-		t.ServeJson(existCode)
-	} else {
-		t.ServeJson("没有权限")
-	}
-
-}
-
-//批量关闭任务
-func (t *TaskM) BatchClose() {
-	ids := strings.Split(t.GetString("ids"), ",")
-	codes := strings.Split(t.GetString("codes"), ",")
-	auth := qu.IntAll(t.GetSession("auth"))
-	var falseCode []string
-	if auth == role_admin {
-		for k, id := range ids {
-			query := bson.M{
-				"_id": bson.ObjectIdHex(id),
-			}
-			update := bson.M{
-				"$set": bson.M{
-					"i_state": 6,
-				},
-			}
-			flag := mgdb.Update("task", query, update, false, false)
-			log.Println("任务id:", id, "	关闭:", flag)
-			if !flag {
-				falseCode = append(falseCode, codes[k])
-			} else {
-				go updateClose(codes[k]) //更新closeRate
-			}
-		}
-		t.ServeJson(falseCode)
-	} else {
-		t.ServeJson("没有权限")
-	}
-}
-
-func (t *TaskM) GetJumpMark() {
-	jumpMark := t.GetSession("jumpMark")
-	if jumpMark == "y" {
-		t.DelSession("jumpMark")
-		t.ServeJson("y")
-	} else {
-		return
-	}
-}
-
-//更新closerate
-func updateClose(code string) {
-	defer qu.Catch()
-	query := bson.M{
-		"s_code": code,
-	}
-	data := *mgdb.FindOne("closerate", query)
-	if data != nil && len(data) > 0 {
-		arr := qu.ObjArrToStringArr(data["timeClose"].([]interface{}))
-		last := arr[len(arr)-1] //更新最后一天的数据
-		timeAndClose := strings.Split(last, ":")
-		if len(timeAndClose) >= 2 {
-			arr[len(arr)-1] = timeAndClose[0] + ":3"
-		}
-		//更新
-		update := bson.M{
-			"$set": bson.M{
-				"timeClose": arr,
-			},
-		}
-		flag := mgdb.Update("closerate", query, update, false, false)
-		fmt.Println("closerate关闭任务:code	", flag)
-	}
-}
-func queryCriteria(urgency, taskState, event, stype int) (query bson.M) {
-	query = bson.M{}
-	if urgency >= 0 {
-		query["s_urgency"] = strconv.Itoa(urgency)
-	}
-	if taskState >= 0 {
-		query["i_state"] = taskState
-	}
-	if event >= 0 {
-		query["i_event"] = event
-	}
-	if stype >= 0 {
-		query["s_type"] = strconv.Itoa(stype)
-	}
-
-	// if urgency >= 0 && taskState >= 0 && event >= 0 { //选择节点,状态和紧急度
-	// 	query = bson.M{
-	// 		"s_urgency": strconv.Itoa(urgency),
-	// 		"i_state":   taskState,
-	// 		"i_event":   event,
-	// 	}
-	// } else if event >= 0 && urgency < 0 && taskState >= 0 { //选择节点和状态,未选择紧急度
-	// 	query = bson.M{
-	// 		"i_state": taskState,
-	// 		"i_event": event,
-	// 	}
-	// } else if event >= 0 && urgency >= 0 && taskState < 0 { //选择节点和紧急度,未选择状态
-	// 	query = bson.M{
-	// 		"i_event":   event,
-	// 		"s_urgency": strconv.Itoa(urgency),
-	// 	}
-	// } else if event >= 0 && urgency < 0 && taskState < 0 { //选择节点,未选择紧急度和状态
-	// 	query = bson.M{
-	// 		"i_event": event,
-	// 	}
-	// } else if event < 0 && urgency >= 0 && taskState >= 0 { //未选择节点,选择紧急度和状态
-	// 	query = bson.M{
-	// 		"s_urgency": strconv.Itoa(urgency),
-	// 		"i_state":   taskState,
-	// 	}
-	// } else if event < 0 && urgency < 0 && taskState >= 0 { //未选择节点和紧急度,选择状态
-	// 	query = bson.M{
-	// 		"i_state": taskState,
-	// 	}
-	// } else if event < 0 && urgency >= 0 && taskState < 0 { //未选择节点和状态,选择紧急度
-	// 	query = bson.M{
-	// 		"s_urgency": strconv.Itoa(urgency),
-	// 	}
-	// } else {
-	// 	query = make(map[string]interface{})
-	// }
-	return
-}
-
-func (t *TaskM) SearchErrLog() {
-	href := t.GetString("href")
-	data := *mgu.FindOne("regatherdata", "spider", "spider", map[string]interface{}{"href": href})
-	if data != nil && len(data) > 0 {
-		t.ServeJson("日志:" + qu.ObjToString(data["error"]))
-	} else {
-		t.ServeJson("无信息")
-	}
-}
-
-func (t *TaskM) SearchDataInfo() {
-	href := t.GetString("href")
-	data := *mgu.FindOne("spider_highlistdata", "spider", "spider", map[string]interface{}{"href": href})
-	if data != nil && len(data) > 0 {
-		t.ServeJson("标题:" + qu.ObjToString(data["title"]) + "\n" + "发布时间:" + qu.ObjToString(data["publishtime"]))
-	} else {
-		t.ServeJson("无信息")
-	}
-}

+ 0 - 157
tomail/sendmail.go

@@ -1,157 +0,0 @@
-package tomail
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/smtp"
-	"qfw/util"
-	mgdb "qfw/util/mongodb"
-	sp "spiderutil"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/cron"
-
-	"gopkg.in/mgo.v2/bson"
-	. "gopkg.in/mgo.v2/bson"
-)
-
-var Mail map[string]interface{}
-
-func TimeTask() {
-	defer util.Catch()
-	c := cron.New()
-	c.Start()
-	c.AddFunc("0 20 9 ? * MON-FRI", CheckCreateTask)
-	c.AddFunc("0 0 */1 ? * *", CheckLuaMove)
-	c.Start()
-}
-
-//监测爬虫由历史转增量时未成功的
-func CheckLuaMove() {
-	defer util.Catch()
-	util.Debug("开始检测爬虫节点移动...")
-	query := map[string]interface{}{
-		"comeintime": map[string]interface{}{
-			"$gte": time.Now().Add(-(time.Hour * 1)).Unix(),
-			"$lte": time.Now().Unix(),
-		},
-		"ok": false,
-	}
-	util.Debug("query:", query)
-	list := *mgdb.Find("luamovelog", query, nil, nil, false, -1, -1)
-	text := ""
-	if len(list) > 0 {
-		for _, l := range list {
-			stype := util.ObjToString(l["type"])
-			code := util.ObjToString(l["code"])
-			text += code + ":" + stype + ";"
-		}
-	}
-	if text != "" {
-		for i := 1; i <= 3; i++ {
-			res, err := http.Get(fmt.Sprintf("%s?to=%s&title=%s&body=%s", sp.Config.JkMail["api"], sp.Config.JkMail["to"], "lua-move-fail", text))
-			if err == nil {
-				res.Body.Close()
-				read, err := ioutil.ReadAll(res.Body)
-				util.Debug("邮件发送:", string(read), err)
-				break
-			}
-		}
-	}
-}
-
-//检测创建任务失败的爬虫
-func CheckCreateTask() {
-	defer util.Catch()
-	util.Debug("开始检测任务创建...")
-	query := map[string]interface{}{
-		"comeintime": map[string]interface{}{
-			"$gte": GetTime(0),
-		},
-	}
-	codes := []string{}
-	list := *mgdb.Find("luacreatetaskerr", query, nil, nil, false, -1, -1)
-	if len(list) > 0 {
-		for _, l := range list {
-			code := util.ObjToString(l["code"])
-			codes = append(codes, code)
-		}
-	}
-	if len(codes) > 0 {
-		for i := 1; i <= 3; i++ {
-			res, err := http.Get(fmt.Sprintf("%s?to=%s&title=%s&body=%s", sp.Config.JkMail["api"], sp.Config.JkMail["to"], "lua-createtask-err", "爬虫:"+strings.Join(codes, ";")))
-			if err == nil {
-				res.Body.Close()
-				read, err := ioutil.ReadAll(res.Body)
-				util.Debug("邮件发送:", string(read), err)
-				break
-			}
-		}
-	}
-}
-
-func SendToMail() {
-	mailInfo := *(util.ObjToMap(Mail["smtp"]))
-	host := mailInfo["host"].(string)
-	from := mailInfo["from"].(string)
-	pwd := mailInfo["password"].(string)
-	subject := mailInfo["subject"].(string)
-
-	hour := time.Now().Hour()
-	if hour == 8 {
-		//定时查询数据库 查询需要发邮件的人和相关信息
-		timeStr := time.Now().Format("2006-01-02")
-		the_time, _ := time.ParseInLocation("2006-01-02", timeStr, time.Local)
-		time_zero := the_time.Unix()         //当日凌晨的时间戳
-		time_twentyFour := time_zero + 86399 //当日24时的时间戳
-		//聚合查询数据
-		//mgdb.InitMongodbPool(5, "192.168.3.207:27080", "editor")
-		sess := mgdb.GetMgoConn()
-		defer mgdb.DestoryMongoConn(sess)
-		var res []M
-		sess.DB("editor").C("task").Pipe([]M{M{"$match": M{"l_complete": M{"$gte": time_zero, "$lte": time_twentyFour}, "i_state": M{"$gte": 1, "$lte": 2}}},
-			M{"$group": M{"_id": "$s_modifyid", "count": M{"$sum": 1}}}}).All(&res)
-		//遍历数据进行发邮件
-		for _, v := range res {
-			_id, ok := v["_id"].(string)
-			if ok {
-				query := bson.M{
-					"_id": bson.ObjectIdHex(_id),
-				}
-				user := *mgdb.FindOne("user", query)
-				if user["s_email"] == nil {
-					continue
-				}
-				num := strconv.Itoa(v["count"].(int))
-				body := `<html><body><h3>你有` + num + `条任务需要今天完成</h3></body></html>`
-				hp := strings.Split(host, ":")
-				auth := smtp.PlainAuth("", from, pwd, hp[0])
-				content_type := "Content-Type: text/html; charset=UTF-8"
-				msg := []byte("To: " + user["s_email"].(string) + "\r\nFrom: " + from + "\r\nSubject: " + subject + "\r\n" + content_type + "\r\n\r\n" + body)
-				send_to := strings.Split(user["s_email"].(string), ";")
-				err := smtp.SendMail(host, auth, from, send_to, msg)
-				if err == nil {
-					log.Println(user["s_email"].(string), "  sendMail   success")
-				} else {
-					log.Println(user["s_email"].(string), "  sendMail   fail")
-				}
-			}
-		}
-		time.Sleep(1 * time.Hour)
-	}
-	//time.AfterFunc(30*time.Minute, func() { SendToMail(to, num) })
-	time.AfterFunc(30*time.Minute, SendToMail)
-}
-
-//获取第day天凌晨的时间戳
-func GetTime(day int) int64 {
-	defer util.Catch()
-	nowTime := time.Now().AddDate(0, 0, day)
-	timeStr := util.FormatDate(&nowTime, util.Date_Short_Layout)
-	t, _ := time.ParseInLocation(util.Date_Short_Layout, timeStr, time.Local)
-	return t.Unix()
-}

+ 0 - 4
transfercode.json

@@ -1,4 +0,0 @@
-{
-	"bidding":4002,
-	"projectinfo":4101
-}

+ 0 - 37
udp/udp.go

@@ -1,37 +0,0 @@
-package udp
-
-import (
-	mu "mfw/util"
-	"net"
-	qu "qfw/util"
-	sp "spiderutil"
-	"sync"
-)
-
-var Udpclient mu.UdpClient //udp对象
-var ToAdd = &net.UDPAddr{}
-var Ch = make(chan string, 1)
-var IsSendUdp bool
-var SendUdpLock = &sync.Mutex{}
-
-func InitUdp() {
-	Udpclient = mu.UdpClient{Local: sp.Config.LocalUdpPort, BufSize: 1024}
-	Udpclient.Listen(func(b byte, data []byte, add *net.UDPAddr) {
-		switch b {
-		case mu.OP_NOOP: //下个节点回应
-			info := string(data)
-			qu.Debug(info)
-			Ch <- info
-		}
-	})
-	ToAdd = &net.UDPAddr{
-		IP:   net.ParseIP(sp.Config.UdpAddr),
-		Port: sp.Config.UdpPort,
-	}
-}
-
-func SendUdp(by []byte) {
-	defer qu.Catch()
-	IsSendUdp = true
-	Udpclient.WriteUdp(by, mu.OP_TYPE_DATA, ToAdd)
-}

+ 0 - 190
util/util.go

@@ -1,190 +0,0 @@
-package util
-
-import (
-	"fmt"
-	mgo "mongodb"
-	qu "qfw/util"
-	"regexp"
-	sp "spiderutil"
-	"strings"
-	"time"
-
-	"github.com/yuin/gopher-lua"
-)
-
-var (
-	MgoE            *mgo.MongodbSim
-	Province        map[string][]string
-	DomainNameReg   = regexp.MustCompile(`(http|https)[::]+`)
-	DownLoadReg     = regexp.MustCompile(`download\(.*?\)`)
-	CodeTypeReg     = regexp.MustCompile(`(utf8|utf-8|gbk)`)
-	TitleFilterReg1 = regexp.MustCompile(`[\p{Han}]`)
-	TitleFilterReg2 = regexp.MustCompile(`((上|下)一页|阅读次数)`)
-	CheckText       = `item["spidercode"]="%s";item["site"]="%s";item["channel"]="%s"`
-	JsonDataMap     = map[string]bool{ //jsondata
-		"extweight":          true,
-		"projecthref":        true,
-		"sourcewebsite":      true,
-		"sourcehref":         true,
-		"area_city_district": true,
-		"projectname":        true,
-		"projectcode":        true,
-		"approvalno":         true,
-		"projectscope":       true,
-		"item":               true,
-		"buyer":              true,
-		"agency":             true,
-		"budget":             true,
-		"buyer_info":         true,
-		"buyerperson":        true,
-		"buyertel":           true,
-		"buyeraddr":          true,
-		"projectaddr":        true,
-		"publishdept":        true,
-		"funds":              true,
-		"paymenttype":        true,
-		"projectscale":       true,
-		"bidmethod":          true,
-		"bidopentime":        true,
-		"agency_info":        true,
-		"agencyperson":       true,
-		"agencytel":          true,
-		"agencyaddr":         true,
-		"isppp":              true,
-		"winner":             true,
-		"winneraddr":         true,
-		"winnerperson":       true,
-		"winnertel":          true,
-		"bidamount":          true,
-		"currency":           true,
-		"experts":            true,
-		"bidamounttype":      true,
-		"contractname":       true,
-		"countryprojectcode": true,
-		"contractnumber":     true,
-		"projectperiod":      true,
-		"signaturedate":      true,
-		"multipackage":       true,
-		"package":            true,
-		"supervisorrate":     true,
-		"jsoncontent":        true,
-		"purchasinglist":     true,
-		"toptype":            true,
-		"subtype":            true,
-		"winnerorder":        true,
-	}
-)
-
-func InitMgo() {
-	defer qu.Catch()
-	MgoE = &mgo.MongodbSim{
-		MongodbAddr: sp.Config.Dbaddr,
-		DbName:      sp.Config.Dbname,
-		Size:        5,
-	}
-	MgoE.InitPool()
-}
-
-//初始化省市行政区划信息
-func InitAreaCity() {
-	qu.ReadConfig("areacity.json", &Province)
-}
-
-//爬虫整体测试时校验爬虫代码
-func SpiderPassCheckLua(liststr, contentstr string, lua map[string]interface{}) string {
-	msg := []string{}
-	//1.检测spidercode、site、channel
-	if param, ok := lua["param_common"].([]interface{}); ok && len(param) >= 3 {
-		spidercode := qu.ObjToString(param[0])
-		site := qu.ObjToString(param[1])
-		channel := qu.ObjToString(param[2])
-		checkText := fmt.Sprintf(CheckText, spidercode, site, channel)
-		if strings.Contains(liststr, `item["spidercode"]`) && !strings.Contains(liststr, checkText) {
-			msg = append(msg, "检查代码spidercode、site、channel字段值")
-		}
-	}
-	//2.检测https
-	isHttps := false
-	for _, text := range DomainNameReg.FindAllString(liststr, -1) {
-		if strings.Contains(text, "https") {
-			isHttps = true
-		}
-	}
-	if isHttps {
-		downLoadText := DownLoadReg.FindString(contentstr)
-		if downLoadText != "" {
-			textArr := strings.Split(downLoadText, ",")
-			if len(textArr) < 4 {
-				msg = append(msg, "download方法添加下载参数")
-			} else if len(textArr) == 4 {
-				if !CodeTypeReg.MatchString(textArr[0]) || textArr[1] != "true" {
-					msg = append(msg, "download方法添加下载参数")
-				}
-			}
-		}
-	}
-	//3.检测title
-	if strings.Contains(liststr, `item["title"]="a"`) {
-		if !strings.Contains(contentstr, `data["title"]`) {
-			msg = append(msg, "检查代码title的完整性")
-		}
-	}
-	return strings.Join(msg, ",")
-}
-
-//爬虫整体测试时校验列表页和详情页内容
-func SpiderPassCheckListAndDetail(list []map[string]interface{}, data map[string]interface{}) string {
-	msg := []string{}
-	if len(list) > 0 {
-		p_zero := 0
-		h_flag := true
-		n_flag := true
-		l_flag := true
-		for _, l := range list {
-			//校验title
-			title := qu.ObjToString(l["title"])
-			if !TitleFilterReg1.MatchString(title) && h_flag {
-				msg = append(msg, "列表页title中无汉字")
-				h_flag = false
-			} else if TitleFilterReg2.MatchString(title) && n_flag {
-				msg = append(msg, "列表页title中含有上(下)一页")
-				n_flag = false
-			}
-			publishtime := qu.ObjToString(l["publishtime"])
-			if publishtime == "0" {
-				p_zero++
-			} else if l_flag {
-				t, _ := time.ParseInLocation(qu.Date_Full_Layout, publishtime, time.Local)
-				if t.Unix() <= 0 {
-					msg = append(msg, "列表页数据发布时间异常")
-					l_flag = false
-				}
-			}
-		}
-		if len(data) > 0 {
-			//校验publishtime
-			if l_np_publishtime := data["l_np_publishtime"].(lua.LNumber); l_np_publishtime <= 0 {
-				msg = append(msg, "三级页发布时间小于0")
-			} else if p_zero == len(list) && l_np_publishtime == 0 {
-				msg = append(msg, "三级页发布时间异常")
-			}
-			contenthtml := qu.ObjToString(data["contenthtml"])
-			if strings.Contains(contenthtml, "img") {
-				msg = append(msg, "contenthtml中含有img是否下载")
-			}
-			detail := qu.ObjToString(data["detail"])
-			if TitleFilterReg2.MatchString(detail) {
-				msg = append(msg, "三级页正文提取异常")
-			}
-			//校验jsondata
-			if jsondata, ok := data["jsondata"].(map[string]interface{}); ok && len(jsondata) > 0 {
-				for field, _ := range jsondata {
-					if !JsonDataMap[field] {
-						msg = append(msg, "jsondata中"+field+"属性错误")
-					}
-				}
-			}
-		}
-	}
-	return strings.Join(msg, ",")
-}

+ 0 - 347
web/staticres/codemirror/codemirror.css

@@ -1,347 +0,0 @@
-/* BASICS */
-
-.CodeMirror {
-  /* Set height, width, borders, and global font properties here */
-  font-family: monospace;
-  height: 300px;
-  color: black;
-}
-
-/* PADDING */
-
-.CodeMirror-lines {
-  padding: 4px 0; /* Vertical padding around content */
-}
-.CodeMirror pre {
-  padding: 0 4px; /* Horizontal padding of content */
-}
-
-.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  background-color: white; /* The little square between H and V scrollbars */
-}
-
-/* GUTTER */
-
-.CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
-  white-space: nowrap;
-}
-.CodeMirror-linenumbers {}
-.CodeMirror-linenumber {
-  padding: 0 3px 0 5px;
-  min-width: 20px;
-  text-align: right;
-  color: #999;
-  white-space: nowrap;
-}
-
-.CodeMirror-guttermarker { color: black; }
-.CodeMirror-guttermarker-subtle { color: #999; }
-
-/* CURSOR */
-
-.CodeMirror-cursor {
-  border-left: 1px solid black;
-  border-right: none;
-  width: 0;
-}
-/* Shown when moving in bi-directional text */
-.CodeMirror div.CodeMirror-secondarycursor {
-  border-left: 1px solid silver;
-}
-.cm-fat-cursor .CodeMirror-cursor {
-  width: auto;
-  border: 0 !important;
-  background: #7e7;
-}
-.cm-fat-cursor div.CodeMirror-cursors {
-  z-index: 1;
-}
-
-.cm-animate-fat-cursor {
-  width: auto;
-  border: 0;
-  -webkit-animation: blink 1.06s steps(1) infinite;
-  -moz-animation: blink 1.06s steps(1) infinite;
-  animation: blink 1.06s steps(1) infinite;
-  background-color: #7e7;
-}
-@-moz-keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-@-webkit-keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-@keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-
-/* Can style cursor different in overwrite (non-insert) mode */
-.CodeMirror-overwrite .CodeMirror-cursor {}
-
-.cm-tab { display: inline-block; text-decoration: inherit; }
-
-.CodeMirror-rulers {
-  position: absolute;
-  left: 0; right: 0; top: -50px; bottom: -20px;
-  overflow: hidden;
-}
-.CodeMirror-ruler {
-  border-left: 1px solid #ccc;
-  top: 0; bottom: 0;
-  position: absolute;
-}
-
-/* DEFAULT THEME */
-
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
-.cm-s-default .cm-keyword {color: #708;}
-.cm-s-default .cm-atom {color: #219;}
-.cm-s-default .cm-number {color: #164;}
-.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable,
-.cm-s-default .cm-punctuation,
-.cm-s-default .cm-property,
-.cm-s-default .cm-operator {}
-.cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-comment {color: #a50;}
-.cm-s-default .cm-string {color: #a11;}
-.cm-s-default .cm-string-2 {color: #f50;}
-.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-qualifier {color: #555;}
-.cm-s-default .cm-builtin {color: #30a;}
-.cm-s-default .cm-bracket {color: #997;}
-.cm-s-default .cm-tag {color: #170;}
-.cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-hr {color: #999;}
-.cm-s-default .cm-link {color: #00c;}
-
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
-
-.CodeMirror-composing { border-bottom: 2px solid; }
-
-/* Default styles for common addons */
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
-.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline-background {background: #e8f2ff;}
-
-/* STOP */
-
-/* The rest of this file contains styles related to the mechanics of
-   the editor. You probably shouldn't touch them. */
-
-.CodeMirror {
-  position: relative;
-  overflow: hidden;
-  background: white;
-}
-
-.CodeMirror-scroll {
-  overflow: scroll !important; /* Things will break if this is overridden */
-  /* 30px is the magic margin used to hide the element's real scrollbars */
-  /* See overflow: hidden in .CodeMirror */
-  margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px;
-  height: 100%;
-  outline: none; /* Prevent dragging from highlighting the element */
-  position: relative;
-}
-.CodeMirror-sizer {
-  position: relative;
-  border-right: 30px solid transparent;
-}
-
-/* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actual scrolling happens, thus preventing shaking and
-   flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  position: absolute;
-  z-index: 6;
-  display: none;
-}
-.CodeMirror-vscrollbar {
-  right: 0; top: 0;
-  overflow-x: hidden;
-  overflow-y: scroll;
-}
-.CodeMirror-hscrollbar {
-  bottom: 0; left: 0;
-  overflow-y: hidden;
-  overflow-x: scroll;
-}
-.CodeMirror-scrollbar-filler {
-  right: 0; bottom: 0;
-}
-.CodeMirror-gutter-filler {
-  left: 0; bottom: 0;
-}
-
-.CodeMirror-gutters {
-  position: absolute; left: 0; top: 0;
-  min-height: 100%;
-  z-index: 3;
-}
-.CodeMirror-gutter {
-  white-space: normal;
-  height: 100%;
-  display: inline-block;
-  vertical-align: top;
-  margin-bottom: -30px;
-  /* Hack to make IE7 behave */
-  *zoom:1;
-  *display:inline;
-}
-.CodeMirror-gutter-wrapper {
-  position: absolute;
-  z-index: 4;
-  background: none !important;
-  border: none !important;
-}
-.CodeMirror-gutter-background {
-  position: absolute;
-  top: 0; bottom: 0;
-  z-index: 4;
-}
-.CodeMirror-gutter-elt {
-  position: absolute;
-  cursor: default;
-  z-index: 4;
-}
-.CodeMirror-gutter-wrapper {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-}
-
-.CodeMirror-lines {
-  cursor: text;
-  min-height: 1px; /* prevents collapsing before first draw */
-}
-.CodeMirror pre {
-  /* Reset some styles that the rest of the page might have set */
-  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
-  border-width: 0;
-  background: transparent;
-  font-family: inherit;
-  font-size: inherit;
-  margin: 0;
-  white-space: pre;
-  word-wrap: normal;
-  line-height: inherit;
-  color: inherit;
-  z-index: 2;
-  position: relative;
-  overflow: visible;
-  -webkit-tap-highlight-color: transparent;
-  -webkit-font-variant-ligatures: none;
-  font-variant-ligatures: none;
-}
-.CodeMirror-wrap pre {
-  word-wrap: break-word;
-  white-space: pre-wrap;
-  word-break: normal;
-}
-
-.CodeMirror-linebackground {
-  position: absolute;
-  left: 0; right: 0; top: 0; bottom: 0;
-  z-index: 0;
-}
-
-.CodeMirror-linewidget {
-  position: relative;
-  z-index: 2;
-  overflow: auto;
-}
-
-.CodeMirror-widget {}
-
-.CodeMirror-code {
-  outline: none;
-}
-
-/* Force content-box sizing for the elements where we expect it */
-.CodeMirror-scroll,
-.CodeMirror-sizer,
-.CodeMirror-gutter,
-.CodeMirror-gutters,
-.CodeMirror-linenumber {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
-
-.CodeMirror-measure {
-  position: absolute;
-  width: 100%;
-  height: 0;
-  overflow: hidden;
-  visibility: hidden;
-}
-
-.CodeMirror-cursor {
-  position: absolute;
-  pointer-events: none;
-}
-.CodeMirror-measure pre { position: static; }
-
-div.CodeMirror-cursors {
-  visibility: hidden;
-  position: relative;
-  z-index: 3;
-}
-div.CodeMirror-dragcursors {
-  visibility: visible;
-}
-
-.CodeMirror-focused div.CodeMirror-cursors {
-  visibility: visible;
-}
-
-.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
-.CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
-.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
-
-.cm-searching {
-  background: #ffa;
-  background: rgba(255, 255, 0, .4);
-}
-
-/* IE7 hack to prevent it from returning funny offsetTops on the spans */
-.CodeMirror span { *vertical-align: text-bottom; }
-
-/* Used to force a border model for a node */
-.cm-force-border { padding-right: .1px; }
-
-@media print {
-  /* Hide the cursor when printing */
-  .CodeMirror div.CodeMirror-cursors {
-    visibility: hidden;
-  }
-}
-
-/* See issue #2901 */
-.cm-tab-wrap-hack:after { content: ''; }
-
-/* Help users use markselection to safely style text background */
-span.CodeMirror-selectedtext { background: none; }

+ 0 - 8935
web/staticres/codemirror/codemirror.js

@@ -1,8935 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// This is CodeMirror (http://codemirror.net), a code editor
-// implemented in JavaScript on top of the browser's DOM.
-//
-// You can find some technical background for some of the code below
-// at http://marijnhaverbeke.nl/blog/#cm-internals .
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    module.exports = mod();
-  else if (typeof define == "function" && define.amd) // AMD
-    return define([], mod);
-  else // Plain browser env
-    (this || window).CodeMirror = mod();
-})(function() {
-  "use strict";
-
-  // BROWSER SNIFFING
-
-  // Kludges for bugs and behavior differences that can't be feature
-  // detected are enabled based on userAgent etc sniffing.
-  var userAgent = navigator.userAgent;
-  var platform = navigator.platform;
-
-  var gecko = /gecko\/\d/i.test(userAgent);
-  var ie_upto10 = /MSIE \d/.test(userAgent);
-  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
-  var ie = ie_upto10 || ie_11up;
-  var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
-  var webkit = /WebKit\//.test(userAgent);
-  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
-  var chrome = /Chrome\//.test(userAgent);
-  var presto = /Opera\//.test(userAgent);
-  var safari = /Apple Computer/.test(navigator.vendor);
-  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
-  var phantom = /PhantomJS/.test(userAgent);
-
-  var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
-  // This is woefully incomplete. Suggestions for alternative methods welcome.
-  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
-  var mac = ios || /Mac/.test(platform);
-  var chromeOS = /\bCrOS\b/.test(userAgent);
-  var windows = /win/i.test(platform);
-
-  var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
-  if (presto_version) presto_version = Number(presto_version[1]);
-  if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
-  // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-  var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
-  var captureRightClick = gecko || (ie && ie_version >= 9);
-
-  // Optimize some code when these features are not used.
-  var sawReadOnlySpans = false, sawCollapsedSpans = false;
-
-  // EDITOR CONSTRUCTOR
-
-  // A CodeMirror instance represents an editor. This is the object
-  // that user code is usually dealing with.
-
-  function CodeMirror(place, options) {
-    if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
-
-    this.options = options = options ? copyObj(options) : {};
-    // Determine effective options based on given values and defaults.
-    copyObj(defaults, options, false);
-    setGuttersForLineNumbers(options);
-
-    var doc = options.value;
-    if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator);
-    this.doc = doc;
-
-    var input = new CodeMirror.inputStyles[options.inputStyle](this);
-    var display = this.display = new Display(place, doc, input);
-    display.wrapper.CodeMirror = this;
-    updateGutters(this);
-    themeChanged(this);
-    if (options.lineWrapping)
-      this.display.wrapper.className += " CodeMirror-wrap";
-    if (options.autofocus && !mobile) display.input.focus();
-    initScrollbars(this);
-
-    this.state = {
-      keyMaps: [],  // stores maps added by addKeyMap
-      overlays: [], // highlighting overlays, as added by addOverlay
-      modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
-      overwrite: false,
-      delayingBlurEvent: false,
-      focused: false,
-      suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
-      pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
-      selectingText: false,
-      draggingText: false,
-      highlight: new Delayed(), // stores highlight worker timeout
-      keySeq: null,  // Unfinished key sequence
-      specialChars: null
-    };
-
-    var cm = this;
-
-    // Override magic textarea content restore that IE sometimes does
-    // on our hidden textarea on reload
-    if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true); }, 20);
-
-    registerEventHandlers(this);
-    ensureGlobalHandlers();
-
-    startOperation(this);
-    this.curOp.forceUpdate = true;
-    attachDoc(this, doc);
-
-    if ((options.autofocus && !mobile) || cm.hasFocus())
-      setTimeout(bind(onFocus, this), 20);
-    else
-      onBlur(this);
-
-    for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
-      optionHandlers[opt](this, options[opt], Init);
-    maybeUpdateLineNumberWidth(this);
-    if (options.finishInit) options.finishInit(this);
-    for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
-    endOperation(this);
-    // Suppress optimizelegibility in Webkit, since it breaks text
-    // measuring on line wrapping boundaries.
-    if (webkit && options.lineWrapping &&
-        getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
-      display.lineDiv.style.textRendering = "auto";
-  }
-
-  // DISPLAY CONSTRUCTOR
-
-  // The display handles the DOM integration, both for input reading
-  // and content drawing. It holds references to DOM nodes and
-  // display-related state.
-
-  function Display(place, doc, input) {
-    var d = this;
-    this.input = input;
-
-    // Covers bottom-right square when both scrollbars are present.
-    d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
-    d.scrollbarFiller.setAttribute("cm-not-content", "true");
-    // Covers bottom of gutter when coverGutterNextToScrollbar is on
-    // and h scrollbar is present.
-    d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
-    d.gutterFiller.setAttribute("cm-not-content", "true");
-    // Will contain the actual code, positioned to cover the viewport.
-    d.lineDiv = elt("div", null, "CodeMirror-code");
-    // Elements are added to these to represent selection and cursors.
-    d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
-    d.cursorDiv = elt("div", null, "CodeMirror-cursors");
-    // A visibility: hidden element used to find the size of things.
-    d.measure = elt("div", null, "CodeMirror-measure");
-    // When lines outside of the viewport are measured, they are drawn in this.
-    d.lineMeasure = elt("div", null, "CodeMirror-measure");
-    // Wraps everything that needs to exist inside the vertically-padded coordinate system
-    d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
-                      null, "position: relative; outline: none");
-    // Moved around its parent to cover visible view.
-    d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
-    // Set to the height of the document, allowing scrolling.
-    d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
-    d.sizerWidth = null;
-    // Behavior of elts with overflow: auto and padding is
-    // inconsistent across browsers. This is used to ensure the
-    // scrollable area is big enough.
-    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
-    // Will contain the gutters, if any.
-    d.gutters = elt("div", null, "CodeMirror-gutters");
-    d.lineGutter = null;
-    // Actual scrollable element.
-    d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
-    d.scroller.setAttribute("tabIndex", "-1");
-    // The element in which the editor lives.
-    d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
-
-    // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
-    if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
-    if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
-
-    if (place) {
-      if (place.appendChild) place.appendChild(d.wrapper);
-      else place(d.wrapper);
-    }
-
-    // Current rendered range (may be bigger than the view window).
-    d.viewFrom = d.viewTo = doc.first;
-    d.reportedViewFrom = d.reportedViewTo = doc.first;
-    // Information about the rendered lines.
-    d.view = [];
-    d.renderedView = null;
-    // Holds info about a single rendered line when it was rendered
-    // for measurement, while not in view.
-    d.externalMeasured = null;
-    // Empty space (in pixels) above the view
-    d.viewOffset = 0;
-    d.lastWrapHeight = d.lastWrapWidth = 0;
-    d.updateLineNumbers = null;
-
-    d.nativeBarWidth = d.barHeight = d.barWidth = 0;
-    d.scrollbarsClipped = false;
-
-    // Used to only resize the line number gutter when necessary (when
-    // the amount of lines crosses a boundary that makes its width change)
-    d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
-    // Set to true when a non-horizontal-scrolling line widget is
-    // added. As an optimization, line widget aligning is skipped when
-    // this is false.
-    d.alignWidgets = false;
-
-    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
-
-    // Tracks the maximum line length so that the horizontal scrollbar
-    // can be kept static when scrolling.
-    d.maxLine = null;
-    d.maxLineLength = 0;
-    d.maxLineChanged = false;
-
-    // Used for measuring wheel scrolling granularity
-    d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
-
-    // True when shift is held down.
-    d.shift = false;
-
-    // Used to track whether anything happened since the context menu
-    // was opened.
-    d.selForContextMenu = null;
-
-    d.activeTouch = null;
-
-    input.init(d);
-  }
-
-  // STATE UPDATES
-
-  // Used to get the editor into a consistent state again when options change.
-
-  function loadMode(cm) {
-    cm.doc.mode = CodeMirror.getMode(cm.options, cm.doc.modeOption);
-    resetModeState(cm);
-  }
-
-  function resetModeState(cm) {
-    cm.doc.iter(function(line) {
-      if (line.stateAfter) line.stateAfter = null;
-      if (line.styles) line.styles = null;
-    });
-    cm.doc.frontier = cm.doc.first;
-    startWorker(cm, 100);
-    cm.state.modeGen++;
-    if (cm.curOp) regChange(cm);
-  }
-
-  function wrappingChanged(cm) {
-    if (cm.options.lineWrapping) {
-      addClass(cm.display.wrapper, "CodeMirror-wrap");
-      cm.display.sizer.style.minWidth = "";
-      cm.display.sizerWidth = null;
-    } else {
-      rmClass(cm.display.wrapper, "CodeMirror-wrap");
-      findMaxLine(cm);
-    }
-    estimateLineHeights(cm);
-    regChange(cm);
-    clearCaches(cm);
-    setTimeout(function(){updateScrollbars(cm);}, 100);
-  }
-
-  // Returns a function that estimates the height of a line, to use as
-  // first approximation until the line becomes visible (and is thus
-  // properly measurable).
-  function estimateHeight(cm) {
-    var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
-    var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
-    return function(line) {
-      if (lineIsHidden(cm.doc, line)) return 0;
-
-      var widgetsHeight = 0;
-      if (line.widgets) for (var i = 0; i < line.widgets.length; i++) {
-        if (line.widgets[i].height) widgetsHeight += line.widgets[i].height;
-      }
-
-      if (wrapping)
-        return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th;
-      else
-        return widgetsHeight + th;
-    };
-  }
-
-  function estimateLineHeights(cm) {
-    var doc = cm.doc, est = estimateHeight(cm);
-    doc.iter(function(line) {
-      var estHeight = est(line);
-      if (estHeight != line.height) updateLineHeight(line, estHeight);
-    });
-  }
-
-  function themeChanged(cm) {
-    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
-      cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
-    clearCaches(cm);
-  }
-
-  function guttersChanged(cm) {
-    updateGutters(cm);
-    regChange(cm);
-    setTimeout(function(){alignHorizontally(cm);}, 20);
-  }
-
-  // Rebuild the gutter elements, ensure the margin to the left of the
-  // code matches their width.
-  function updateGutters(cm) {
-    var gutters = cm.display.gutters, specs = cm.options.gutters;
-    removeChildren(gutters);
-    for (var i = 0; i < specs.length; ++i) {
-      var gutterClass = specs[i];
-      var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass));
-      if (gutterClass == "CodeMirror-linenumbers") {
-        cm.display.lineGutter = gElt;
-        gElt.style.width = (cm.display.lineNumWidth || 1) + "px";
-      }
-    }
-    gutters.style.display = i ? "" : "none";
-    updateGutterSpace(cm);
-  }
-
-  function updateGutterSpace(cm) {
-    var width = cm.display.gutters.offsetWidth;
-    cm.display.sizer.style.marginLeft = width + "px";
-  }
-
-  // Compute the character length of a line, taking into account
-  // collapsed ranges (see markText) that might hide parts, and join
-  // other lines onto it.
-  function lineLength(line) {
-    if (line.height == 0) return 0;
-    var len = line.text.length, merged, cur = line;
-    while (merged = collapsedSpanAtStart(cur)) {
-      var found = merged.find(0, true);
-      cur = found.from.line;
-      len += found.from.ch - found.to.ch;
-    }
-    cur = line;
-    while (merged = collapsedSpanAtEnd(cur)) {
-      var found = merged.find(0, true);
-      len -= cur.text.length - found.from.ch;
-      cur = found.to.line;
-      len += cur.text.length - found.to.ch;
-    }
-    return len;
-  }
-
-  // Find the longest line in the document.
-  function findMaxLine(cm) {
-    var d = cm.display, doc = cm.doc;
-    d.maxLine = getLine(doc, doc.first);
-    d.maxLineLength = lineLength(d.maxLine);
-    d.maxLineChanged = true;
-    doc.iter(function(line) {
-      var len = lineLength(line);
-      if (len > d.maxLineLength) {
-        d.maxLineLength = len;
-        d.maxLine = line;
-      }
-    });
-  }
-
-  // Make sure the gutters options contains the element
-  // "CodeMirror-linenumbers" when the lineNumbers option is true.
-  function setGuttersForLineNumbers(options) {
-    var found = indexOf(options.gutters, "CodeMirror-linenumbers");
-    if (found == -1 && options.lineNumbers) {
-      options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
-    } else if (found > -1 && !options.lineNumbers) {
-      options.gutters = options.gutters.slice(0);
-      options.gutters.splice(found, 1);
-    }
-  }
-
-  // SCROLLBARS
-
-  // Prepare DOM reads needed to update the scrollbars. Done in one
-  // shot to minimize update/measure roundtrips.
-  function measureForScrollbars(cm) {
-    var d = cm.display, gutterW = d.gutters.offsetWidth;
-    var docH = Math.round(cm.doc.height + paddingVert(cm.display));
-    return {
-      clientHeight: d.scroller.clientHeight,
-      viewHeight: d.wrapper.clientHeight,
-      scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
-      viewWidth: d.wrapper.clientWidth,
-      barLeft: cm.options.fixedGutter ? gutterW : 0,
-      docHeight: docH,
-      scrollHeight: docH + scrollGap(cm) + d.barHeight,
-      nativeBarWidth: d.nativeBarWidth,
-      gutterWidth: gutterW
-    };
-  }
-
-  function NativeScrollbars(place, scroll, cm) {
-    this.cm = cm;
-    var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
-    var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
-    place(vert); place(horiz);
-
-    on(vert, "scroll", function() {
-      if (vert.clientHeight) scroll(vert.scrollTop, "vertical");
-    });
-    on(horiz, "scroll", function() {
-      if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
-    });
-
-    this.checkedZeroWidth = false;
-    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
-  }
-
-  NativeScrollbars.prototype = copyObj({
-    update: function(measure) {
-      var needsH = measure.scrollWidth > measure.clientWidth + 1;
-      var needsV = measure.scrollHeight > measure.clientHeight + 1;
-      var sWidth = measure.nativeBarWidth;
-
-      if (needsV) {
-        this.vert.style.display = "block";
-        this.vert.style.bottom = needsH ? sWidth + "px" : "0";
-        var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
-        // A bug in IE8 can cause this value to be negative, so guard it.
-        this.vert.firstChild.style.height =
-          Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
-      } else {
-        this.vert.style.display = "";
-        this.vert.firstChild.style.height = "0";
-      }
-
-      if (needsH) {
-        this.horiz.style.display = "block";
-        this.horiz.style.right = needsV ? sWidth + "px" : "0";
-        this.horiz.style.left = measure.barLeft + "px";
-        var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
-        this.horiz.firstChild.style.width =
-          (measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
-      } else {
-        this.horiz.style.display = "";
-        this.horiz.firstChild.style.width = "0";
-      }
-
-      if (!this.checkedZeroWidth && measure.clientHeight > 0) {
-        if (sWidth == 0) this.zeroWidthHack();
-        this.checkedZeroWidth = true;
-      }
-
-      return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
-    },
-    setScrollLeft: function(pos) {
-      if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
-      if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz);
-    },
-    setScrollTop: function(pos) {
-      if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
-      if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert);
-    },
-    zeroWidthHack: function() {
-      var w = mac && !mac_geMountainLion ? "12px" : "18px";
-      this.horiz.style.height = this.vert.style.width = w;
-      this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";
-      this.disableHoriz = new Delayed;
-      this.disableVert = new Delayed;
-    },
-    enableZeroWidthBar: function(bar, delay) {
-      bar.style.pointerEvents = "auto";
-      function maybeDisable() {
-        // To find out whether the scrollbar is still visible, we
-        // check whether the element under the pixel in the bottom
-        // left corner of the scrollbar box is the scrollbar box
-        // itself (when the bar is still visible) or its filler child
-        // (when the bar is hidden). If it is still visible, we keep
-        // it enabled, if it's hidden, we disable pointer events.
-        var box = bar.getBoundingClientRect();
-        var elt = document.elementFromPoint(box.left + 1, box.bottom - 1);
-        if (elt != bar) bar.style.pointerEvents = "none";
-        else delay.set(1000, maybeDisable);
-      }
-      delay.set(1000, maybeDisable);
-    },
-    clear: function() {
-      var parent = this.horiz.parentNode;
-      parent.removeChild(this.horiz);
-      parent.removeChild(this.vert);
-    }
-  }, NativeScrollbars.prototype);
-
-  function NullScrollbars() {}
-
-  NullScrollbars.prototype = copyObj({
-    update: function() { return {bottom: 0, right: 0}; },
-    setScrollLeft: function() {},
-    setScrollTop: function() {},
-    clear: function() {}
-  }, NullScrollbars.prototype);
-
-  CodeMirror.scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
-
-  function initScrollbars(cm) {
-    if (cm.display.scrollbars) {
-      cm.display.scrollbars.clear();
-      if (cm.display.scrollbars.addClass)
-        rmClass(cm.display.wrapper, cm.display.scrollbars.addClass);
-    }
-
-    cm.display.scrollbars = new CodeMirror.scrollbarModel[cm.options.scrollbarStyle](function(node) {
-      cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
-      // Prevent clicks in the scrollbars from killing focus
-      on(node, "mousedown", function() {
-        if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0);
-      });
-      node.setAttribute("cm-not-content", "true");
-    }, function(pos, axis) {
-      if (axis == "horizontal") setScrollLeft(cm, pos);
-      else setScrollTop(cm, pos);
-    }, cm);
-    if (cm.display.scrollbars.addClass)
-      addClass(cm.display.wrapper, cm.display.scrollbars.addClass);
-  }
-
-  function updateScrollbars(cm, measure) {
-    if (!measure) measure = measureForScrollbars(cm);
-    var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
-    updateScrollbarsInner(cm, measure);
-    for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
-      if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
-        updateHeightsInViewport(cm);
-      updateScrollbarsInner(cm, measureForScrollbars(cm));
-      startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
-    }
-  }
-
-  // Re-synchronize the fake scrollbars with the actual size of the
-  // content.
-  function updateScrollbarsInner(cm, measure) {
-    var d = cm.display;
-    var sizes = d.scrollbars.update(measure);
-
-    d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
-    d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
-    d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"
-
-    if (sizes.right && sizes.bottom) {
-      d.scrollbarFiller.style.display = "block";
-      d.scrollbarFiller.style.height = sizes.bottom + "px";
-      d.scrollbarFiller.style.width = sizes.right + "px";
-    } else d.scrollbarFiller.style.display = "";
-    if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
-      d.gutterFiller.style.display = "block";
-      d.gutterFiller.style.height = sizes.bottom + "px";
-      d.gutterFiller.style.width = measure.gutterWidth + "px";
-    } else d.gutterFiller.style.display = "";
-  }
-
-  // Compute the lines that are visible in a given viewport (defaults
-  // the the current scroll position). viewport may contain top,
-  // height, and ensure (see op.scrollToPos) properties.
-  function visibleLines(display, doc, viewport) {
-    var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
-    top = Math.floor(top - paddingTop(display));
-    var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
-
-    var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
-    // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
-    // forces those lines into the viewport (if possible).
-    if (viewport && viewport.ensure) {
-      var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
-      if (ensureFrom < from) {
-        from = ensureFrom;
-        to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
-      } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
-        from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
-        to = ensureTo;
-      }
-    }
-    return {from: from, to: Math.max(to, from + 1)};
-  }
-
-  // LINE NUMBERS
-
-  // Re-align line numbers and gutter marks to compensate for
-  // horizontal scrolling.
-  function alignHorizontally(cm) {
-    var display = cm.display, view = display.view;
-    if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return;
-    var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
-    var gutterW = display.gutters.offsetWidth, left = comp + "px";
-    for (var i = 0; i < view.length; i++) if (!view[i].hidden) {
-      if (cm.options.fixedGutter && view[i].gutter)
-        view[i].gutter.style.left = left;
-      var align = view[i].alignable;
-      if (align) for (var j = 0; j < align.length; j++)
-        align[j].style.left = left;
-    }
-    if (cm.options.fixedGutter)
-      display.gutters.style.left = (comp + gutterW) + "px";
-  }
-
-  // Used to ensure that the line number gutter is still the right
-  // size for the current document size. Returns true when an update
-  // is needed.
-  function maybeUpdateLineNumberWidth(cm) {
-    if (!cm.options.lineNumbers) return false;
-    var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
-    if (last.length != display.lineNumChars) {
-      var test = display.measure.appendChild(elt("div", [elt("div", last)],
-                                                 "CodeMirror-linenumber CodeMirror-gutter-elt"));
-      var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
-      display.lineGutter.style.width = "";
-      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
-      display.lineNumWidth = display.lineNumInnerWidth + padding;
-      display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
-      display.lineGutter.style.width = display.lineNumWidth + "px";
-      updateGutterSpace(cm);
-      return true;
-    }
-    return false;
-  }
-
-  function lineNumberFor(options, i) {
-    return String(options.lineNumberFormatter(i + options.firstLineNumber));
-  }
-
-  // Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
-  // but using getBoundingClientRect to get a sub-pixel-accurate
-  // result.
-  function compensateForHScroll(display) {
-    return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left;
-  }
-
-  // DISPLAY DRAWING
-
-  function DisplayUpdate(cm, viewport, force) {
-    var display = cm.display;
-
-    this.viewport = viewport;
-    // Store some values that we'll need later (but don't want to force a relayout for)
-    this.visible = visibleLines(display, cm.doc, viewport);
-    this.editorIsHidden = !display.wrapper.offsetWidth;
-    this.wrapperHeight = display.wrapper.clientHeight;
-    this.wrapperWidth = display.wrapper.clientWidth;
-    this.oldDisplayWidth = displayWidth(cm);
-    this.force = force;
-    this.dims = getDimensions(cm);
-    this.events = [];
-  }
-
-  DisplayUpdate.prototype.signal = function(emitter, type) {
-    if (hasHandler(emitter, type))
-      this.events.push(arguments);
-  };
-  DisplayUpdate.prototype.finish = function() {
-    for (var i = 0; i < this.events.length; i++)
-      signal.apply(null, this.events[i]);
-  };
-
-  function maybeClipScrollbars(cm) {
-    var display = cm.display;
-    if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
-      display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
-      display.heightForcer.style.height = scrollGap(cm) + "px";
-      display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
-      display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
-      display.scrollbarsClipped = true;
-    }
-  }
-
-  // Does the actual updating of the line display. Bails out
-  // (returning false) when there is nothing to be done and forced is
-  // false.
-  function updateDisplayIfNeeded(cm, update) {
-    var display = cm.display, doc = cm.doc;
-
-    if (update.editorIsHidden) {
-      resetView(cm);
-      return false;
-    }
-
-    // Bail out if the visible area is already rendered and nothing changed.
-    if (!update.force &&
-        update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
-        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
-        display.renderedView == display.view && countDirtyView(cm) == 0)
-      return false;
-
-    if (maybeUpdateLineNumberWidth(cm)) {
-      resetView(cm);
-      update.dims = getDimensions(cm);
-    }
-
-    // Compute a suitable new viewport (from & to)
-    var end = doc.first + doc.size;
-    var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
-    var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
-    if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
-    if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
-    if (sawCollapsedSpans) {
-      from = visualLineNo(cm.doc, from);
-      to = visualLineEndNo(cm.doc, to);
-    }
-
-    var different = from != display.viewFrom || to != display.viewTo ||
-      display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
-    adjustView(cm, from, to);
-
-    display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
-    // Position the mover div to align with the current scroll position
-    cm.display.mover.style.top = display.viewOffset + "px";
-
-    var toUpdate = countDirtyView(cm);
-    if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
-        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
-      return false;
-
-    // For big changes, we hide the enclosing element during the
-    // update, since that speeds up the operations on most browsers.
-    var focused = activeElt();
-    if (toUpdate > 4) display.lineDiv.style.display = "none";
-    patchDisplay(cm, display.updateLineNumbers, update.dims);
-    if (toUpdate > 4) display.lineDiv.style.display = "";
-    display.renderedView = display.view;
-    // There might have been a widget with a focused element that got
-    // hidden or updated, if so re-focus it.
-    if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
-
-    // Prevent selection and cursors from interfering with the scroll
-    // width and height.
-    removeChildren(display.cursorDiv);
-    removeChildren(display.selectionDiv);
-    display.gutters.style.height = display.sizer.style.minHeight = 0;
-
-    if (different) {
-      display.lastWrapHeight = update.wrapperHeight;
-      display.lastWrapWidth = update.wrapperWidth;
-      startWorker(cm, 400);
-    }
-
-    display.updateLineNumbers = null;
-
-    return true;
-  }
-
-  function postUpdateDisplay(cm, update) {
-    var viewport = update.viewport;
-
-    for (var first = true;; first = false) {
-      if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
-        // Clip forced viewport to actual scrollable area.
-        if (viewport && viewport.top != null)
-          viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)};
-        // Updated line heights might result in the drawn area not
-        // actually covering the viewport. Keep looping until it does.
-        update.visible = visibleLines(cm.display, cm.doc, viewport);
-        if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
-          break;
-      }
-      if (!updateDisplayIfNeeded(cm, update)) break;
-      updateHeightsInViewport(cm);
-      var barMeasure = measureForScrollbars(cm);
-      updateSelection(cm);
-      updateScrollbars(cm, barMeasure);
-      setDocumentHeight(cm, barMeasure);
-    }
-
-    update.signal(cm, "update", cm);
-    if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
-      update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
-      cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
-    }
-  }
-
-  function updateDisplaySimple(cm, viewport) {
-    var update = new DisplayUpdate(cm, viewport);
-    if (updateDisplayIfNeeded(cm, update)) {
-      updateHeightsInViewport(cm);
-      postUpdateDisplay(cm, update);
-      var barMeasure = measureForScrollbars(cm);
-      updateSelection(cm);
-      updateScrollbars(cm, barMeasure);
-      setDocumentHeight(cm, barMeasure);
-      update.finish();
-    }
-  }
-
-  function setDocumentHeight(cm, measure) {
-    cm.display.sizer.style.minHeight = measure.docHeight + "px";
-    cm.display.heightForcer.style.top = measure.docHeight + "px";
-    cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";
-  }
-
-  // Read the actual heights of the rendered lines, and update their
-  // stored heights to match.
-  function updateHeightsInViewport(cm) {
-    var display = cm.display;
-    var prevBottom = display.lineDiv.offsetTop;
-    for (var i = 0; i < display.view.length; i++) {
-      var cur = display.view[i], height;
-      if (cur.hidden) continue;
-      if (ie && ie_version < 8) {
-        var bot = cur.node.offsetTop + cur.node.offsetHeight;
-        height = bot - prevBottom;
-        prevBottom = bot;
-      } else {
-        var box = cur.node.getBoundingClientRect();
-        height = box.bottom - box.top;
-      }
-      var diff = cur.line.height - height;
-      if (height < 2) height = textHeight(display);
-      if (diff > .001 || diff < -.001) {
-        updateLineHeight(cur.line, height);
-        updateWidgetHeight(cur.line);
-        if (cur.rest) for (var j = 0; j < cur.rest.length; j++)
-          updateWidgetHeight(cur.rest[j]);
-      }
-    }
-  }
-
-  // Read and store the height of line widgets associated with the
-  // given line.
-  function updateWidgetHeight(line) {
-    if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
-      line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight;
-  }
-
-  // Do a bulk-read of the DOM positions and sizes needed to draw the
-  // view, so that we don't interleave reading and writing to the DOM.
-  function getDimensions(cm) {
-    var d = cm.display, left = {}, width = {};
-    var gutterLeft = d.gutters.clientLeft;
-    for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
-      left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
-      width[cm.options.gutters[i]] = n.clientWidth;
-    }
-    return {fixedPos: compensateForHScroll(d),
-            gutterTotalWidth: d.gutters.offsetWidth,
-            gutterLeft: left,
-            gutterWidth: width,
-            wrapperWidth: d.wrapper.clientWidth};
-  }
-
-  // Sync the actual display DOM structure with display.view, removing
-  // nodes for lines that are no longer in view, and creating the ones
-  // that are not there yet, and updating the ones that are out of
-  // date.
-  function patchDisplay(cm, updateNumbersFrom, dims) {
-    var display = cm.display, lineNumbers = cm.options.lineNumbers;
-    var container = display.lineDiv, cur = container.firstChild;
-
-    function rm(node) {
-      var next = node.nextSibling;
-      // Works around a throw-scroll bug in OS X Webkit
-      if (webkit && mac && cm.display.currentWheelTarget == node)
-        node.style.display = "none";
-      else
-        node.parentNode.removeChild(node);
-      return next;
-    }
-
-    var view = display.view, lineN = display.viewFrom;
-    // Loop over the elements in the view, syncing cur (the DOM nodes
-    // in display.lineDiv) with the view as we go.
-    for (var i = 0; i < view.length; i++) {
-      var lineView = view[i];
-      if (lineView.hidden) {
-      } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
-        var node = buildLineElement(cm, lineView, lineN, dims);
-        container.insertBefore(node, cur);
-      } else { // Already drawn
-        while (cur != lineView.node) cur = rm(cur);
-        var updateNumber = lineNumbers && updateNumbersFrom != null &&
-          updateNumbersFrom <= lineN && lineView.lineNumber;
-        if (lineView.changes) {
-          if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false;
-          updateLineForChanges(cm, lineView, lineN, dims);
-        }
-        if (updateNumber) {
-          removeChildren(lineView.lineNumber);
-          lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)));
-        }
-        cur = lineView.node.nextSibling;
-      }
-      lineN += lineView.size;
-    }
-    while (cur) cur = rm(cur);
-  }
-
-  // When an aspect of a line changes, a string is added to
-  // lineView.changes. This updates the relevant part of the line's
-  // DOM structure.
-  function updateLineForChanges(cm, lineView, lineN, dims) {
-    for (var j = 0; j < lineView.changes.length; j++) {
-      var type = lineView.changes[j];
-      if (type == "text") updateLineText(cm, lineView);
-      else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims);
-      else if (type == "class") updateLineClasses(lineView);
-      else if (type == "widget") updateLineWidgets(cm, lineView, dims);
-    }
-    lineView.changes = null;
-  }
-
-  // Lines with gutter elements, widgets or a background class need to
-  // be wrapped, and have the extra elements added to the wrapper div
-  function ensureLineWrapped(lineView) {
-    if (lineView.node == lineView.text) {
-      lineView.node = elt("div", null, null, "position: relative");
-      if (lineView.text.parentNode)
-        lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
-      lineView.node.appendChild(lineView.text);
-      if (ie && ie_version < 8) lineView.node.style.zIndex = 2;
-    }
-    return lineView.node;
-  }
-
-  function updateLineBackground(lineView) {
-    var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass;
-    if (cls) cls += " CodeMirror-linebackground";
-    if (lineView.background) {
-      if (cls) lineView.background.className = cls;
-      else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; }
-    } else if (cls) {
-      var wrap = ensureLineWrapped(lineView);
-      lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild);
-    }
-  }
-
-  // Wrapper around buildLineContent which will reuse the structure
-  // in display.externalMeasured when possible.
-  function getLineContent(cm, lineView) {
-    var ext = cm.display.externalMeasured;
-    if (ext && ext.line == lineView.line) {
-      cm.display.externalMeasured = null;
-      lineView.measure = ext.measure;
-      return ext.built;
-    }
-    return buildLineContent(cm, lineView);
-  }
-
-  // Redraw the line's text. Interacts with the background and text
-  // classes because the mode may output tokens that influence these
-  // classes.
-  function updateLineText(cm, lineView) {
-    var cls = lineView.text.className;
-    var built = getLineContent(cm, lineView);
-    if (lineView.text == lineView.node) lineView.node = built.pre;
-    lineView.text.parentNode.replaceChild(built.pre, lineView.text);
-    lineView.text = built.pre;
-    if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
-      lineView.bgClass = built.bgClass;
-      lineView.textClass = built.textClass;
-      updateLineClasses(lineView);
-    } else if (cls) {
-      lineView.text.className = cls;
-    }
-  }
-
-  function updateLineClasses(lineView) {
-    updateLineBackground(lineView);
-    if (lineView.line.wrapClass)
-      ensureLineWrapped(lineView).className = lineView.line.wrapClass;
-    else if (lineView.node != lineView.text)
-      lineView.node.className = "";
-    var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
-    lineView.text.className = textClass || "";
-  }
-
-  function updateLineGutter(cm, lineView, lineN, dims) {
-    if (lineView.gutter) {
-      lineView.node.removeChild(lineView.gutter);
-      lineView.gutter = null;
-    }
-    if (lineView.gutterBackground) {
-      lineView.node.removeChild(lineView.gutterBackground);
-      lineView.gutterBackground = null;
-    }
-    if (lineView.line.gutterClass) {
-      var wrap = ensureLineWrapped(lineView);
-      lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
-                                      "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
-                                      "px; width: " + dims.gutterTotalWidth + "px");
-      wrap.insertBefore(lineView.gutterBackground, lineView.text);
-    }
-    var markers = lineView.line.gutterMarkers;
-    if (cm.options.lineNumbers || markers) {
-      var wrap = ensureLineWrapped(lineView);
-      var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
-                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px");
-      cm.display.input.setUneditable(gutterWrap);
-      wrap.insertBefore(gutterWrap, lineView.text);
-      if (lineView.line.gutterClass)
-        gutterWrap.className += " " + lineView.line.gutterClass;
-      if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
-        lineView.lineNumber = gutterWrap.appendChild(
-          elt("div", lineNumberFor(cm.options, lineN),
-              "CodeMirror-linenumber CodeMirror-gutter-elt",
-              "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
-              + cm.display.lineNumInnerWidth + "px"));
-      if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) {
-        var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];
-        if (found)
-          gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
-                                     dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"));
-      }
-    }
-  }
-
-  function updateLineWidgets(cm, lineView, dims) {
-    if (lineView.alignable) lineView.alignable = null;
-    for (var node = lineView.node.firstChild, next; node; node = next) {
-      var next = node.nextSibling;
-      if (node.className == "CodeMirror-linewidget")
-        lineView.node.removeChild(node);
-    }
-    insertLineWidgets(cm, lineView, dims);
-  }
-
-  // Build a line's DOM representation from scratch
-  function buildLineElement(cm, lineView, lineN, dims) {
-    var built = getLineContent(cm, lineView);
-    lineView.text = lineView.node = built.pre;
-    if (built.bgClass) lineView.bgClass = built.bgClass;
-    if (built.textClass) lineView.textClass = built.textClass;
-
-    updateLineClasses(lineView);
-    updateLineGutter(cm, lineView, lineN, dims);
-    insertLineWidgets(cm, lineView, dims);
-    return lineView.node;
-  }
-
-  // A lineView may contain multiple logical lines (when merged by
-  // collapsed spans). The widgets for all of them need to be drawn.
-  function insertLineWidgets(cm, lineView, dims) {
-    insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
-    if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-      insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false);
-  }
-
-  function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
-    if (!line.widgets) return;
-    var wrap = ensureLineWrapped(lineView);
-    for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
-      var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
-      if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
-      positionLineWidget(widget, node, lineView, dims);
-      cm.display.input.setUneditable(node);
-      if (allowAbove && widget.above)
-        wrap.insertBefore(node, lineView.gutter || lineView.text);
-      else
-        wrap.appendChild(node);
-      signalLater(widget, "redraw");
-    }
-  }
-
-  function positionLineWidget(widget, node, lineView, dims) {
-    if (widget.noHScroll) {
-      (lineView.alignable || (lineView.alignable = [])).push(node);
-      var width = dims.wrapperWidth;
-      node.style.left = dims.fixedPos + "px";
-      if (!widget.coverGutter) {
-        width -= dims.gutterTotalWidth;
-        node.style.paddingLeft = dims.gutterTotalWidth + "px";
-      }
-      node.style.width = width + "px";
-    }
-    if (widget.coverGutter) {
-      node.style.zIndex = 5;
-      node.style.position = "relative";
-      if (!widget.noHScroll) node.style.marginLeft = -dims.gutterTotalWidth + "px";
-    }
-  }
-
-  // POSITION OBJECT
-
-  // A Pos instance represents a position within the text.
-  var Pos = CodeMirror.Pos = function(line, ch) {
-    if (!(this instanceof Pos)) return new Pos(line, ch);
-    this.line = line; this.ch = ch;
-  };
-
-  // Compare two positions, return 0 if they are the same, a negative
-  // number when a is less, and a positive number otherwise.
-  var cmp = CodeMirror.cmpPos = function(a, b) { return a.line - b.line || a.ch - b.ch; };
-
-  function copyPos(x) {return Pos(x.line, x.ch);}
-  function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
-  function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
-
-  // INPUT HANDLING
-
-  function ensureFocus(cm) {
-    if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
-  }
-
-  // This will be set to a {lineWise: bool, text: [string]} object, so
-  // that, when pasting, we know what kind of selections the copied
-  // text was made out of.
-  var lastCopied = null;
-
-  function applyTextInput(cm, inserted, deleted, sel, origin) {
-    var doc = cm.doc;
-    cm.display.shift = false;
-    if (!sel) sel = doc.sel;
-
-    var paste = cm.state.pasteIncoming || origin == "paste";
-    var textLines = doc.splitLines(inserted), multiPaste = null
-    // When pasing N lines into N selections, insert one line per selection
-    if (paste && sel.ranges.length > 1) {
-      if (lastCopied && lastCopied.text.join("\n") == inserted) {
-        if (sel.ranges.length % lastCopied.text.length == 0) {
-          multiPaste = [];
-          for (var i = 0; i < lastCopied.text.length; i++)
-            multiPaste.push(doc.splitLines(lastCopied.text[i]));
-        }
-      } else if (textLines.length == sel.ranges.length) {
-        multiPaste = map(textLines, function(l) { return [l]; });
-      }
-    }
-
-    // Normal behavior is to insert the new text into every selection
-    for (var i = sel.ranges.length - 1; i >= 0; i--) {
-      var range = sel.ranges[i];
-      var from = range.from(), to = range.to();
-      if (range.empty()) {
-        if (deleted && deleted > 0) // Handle deletion
-          from = Pos(from.line, from.ch - deleted);
-        else if (cm.state.overwrite && !paste) // Handle overwrite
-          to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
-        else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
-          from = to = Pos(from.line, 0)
-      }
-      var updateInput = cm.curOp.updateInput;
-      var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
-                         origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
-      makeChange(cm.doc, changeEvent);
-      signalLater(cm, "inputRead", cm, changeEvent);
-    }
-    if (inserted && !paste)
-      triggerElectric(cm, inserted);
-
-    ensureCursorVisible(cm);
-    cm.curOp.updateInput = updateInput;
-    cm.curOp.typing = true;
-    cm.state.pasteIncoming = cm.state.cutIncoming = false;
-  }
-
-  function handlePaste(e, cm) {
-    var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
-    if (pasted) {
-      e.preventDefault();
-      if (!cm.isReadOnly() && !cm.options.disableInput)
-        runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
-      return true;
-    }
-  }
-
-  function triggerElectric(cm, inserted) {
-    // When an 'electric' character is inserted, immediately trigger a reindent
-    if (!cm.options.electricChars || !cm.options.smartIndent) return;
-    var sel = cm.doc.sel;
-
-    for (var i = sel.ranges.length - 1; i >= 0; i--) {
-      var range = sel.ranges[i];
-      if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue;
-      var mode = cm.getModeAt(range.head);
-      var indented = false;
-      if (mode.electricChars) {
-        for (var j = 0; j < mode.electricChars.length; j++)
-          if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
-            indented = indentLine(cm, range.head.line, "smart");
-            break;
-          }
-      } else if (mode.electricInput) {
-        if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
-          indented = indentLine(cm, range.head.line, "smart");
-      }
-      if (indented) signalLater(cm, "electricInput", cm, range.head.line);
-    }
-  }
-
-  function copyableRanges(cm) {
-    var text = [], ranges = [];
-    for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
-      var line = cm.doc.sel.ranges[i].head.line;
-      var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
-      ranges.push(lineRange);
-      text.push(cm.getRange(lineRange.anchor, lineRange.head));
-    }
-    return {text: text, ranges: ranges};
-  }
-
-  function disableBrowserMagic(field) {
-    field.setAttribute("autocorrect", "off");
-    field.setAttribute("autocapitalize", "off");
-    field.setAttribute("spellcheck", "false");
-  }
-
-  // TEXTAREA INPUT STYLE
-
-  function TextareaInput(cm) {
-    this.cm = cm;
-    // See input.poll and input.reset
-    this.prevInput = "";
-
-    // Flag that indicates whether we expect input to appear real soon
-    // now (after some event like 'keypress' or 'input') and are
-    // polling intensively.
-    this.pollingFast = false;
-    // Self-resetting timeout for the poller
-    this.polling = new Delayed();
-    // Tracks when input.reset has punted to just putting a short
-    // string into the textarea instead of the full selection.
-    this.inaccurateSelection = false;
-    // Used to work around IE issue with selection being forgotten when focus moves away from textarea
-    this.hasSelection = false;
-    this.composing = null;
-  };
-
-  function hiddenTextarea() {
-    var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none");
-    var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
-    // The textarea is kept positioned near the cursor to prevent the
-    // fact that it'll be scrolled into view on input from scrolling
-    // our fake cursor out of view. On webkit, when wrap=off, paste is
-    // very slow. So make the area wide instead.
-    if (webkit) te.style.width = "1000px";
-    else te.setAttribute("wrap", "off");
-    // If border: 0; -- iOS fails to open keyboard (issue #1287)
-    if (ios) te.style.border = "1px solid black";
-    disableBrowserMagic(te);
-    return div;
-  }
-
-  TextareaInput.prototype = copyObj({
-    init: function(display) {
-      var input = this, cm = this.cm;
-
-      // Wraps and hides input textarea
-      var div = this.wrapper = hiddenTextarea();
-      // The semihidden textarea that is focused when the editor is
-      // focused, and receives input.
-      var te = this.textarea = div.firstChild;
-      display.wrapper.insertBefore(div, display.wrapper.firstChild);
-
-      // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
-      if (ios) te.style.width = "0px";
-
-      on(te, "input", function() {
-        if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null;
-        input.poll();
-      });
-
-      on(te, "paste", function(e) {
-        if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
-
-        cm.state.pasteIncoming = true;
-        input.fastPoll();
-      });
-
-      function prepareCopyCut(e) {
-        if (signalDOMEvent(cm, e)) return
-        if (cm.somethingSelected()) {
-          lastCopied = {lineWise: false, text: cm.getSelections()};
-          if (input.inaccurateSelection) {
-            input.prevInput = "";
-            input.inaccurateSelection = false;
-            te.value = lastCopied.text.join("\n");
-            selectInput(te);
-          }
-        } else if (!cm.options.lineWiseCopyCut) {
-          return;
-        } else {
-          var ranges = copyableRanges(cm);
-          lastCopied = {lineWise: true, text: ranges.text};
-          if (e.type == "cut") {
-            cm.setSelections(ranges.ranges, null, sel_dontScroll);
-          } else {
-            input.prevInput = "";
-            te.value = ranges.text.join("\n");
-            selectInput(te);
-          }
-        }
-        if (e.type == "cut") cm.state.cutIncoming = true;
-      }
-      on(te, "cut", prepareCopyCut);
-      on(te, "copy", prepareCopyCut);
-
-      on(display.scroller, "paste", function(e) {
-        if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return;
-        cm.state.pasteIncoming = true;
-        input.focus();
-      });
-
-      // Prevent normal selection in the editor (we handle our own)
-      on(display.lineSpace, "selectstart", function(e) {
-        if (!eventInWidget(display, e)) e_preventDefault(e);
-      });
-
-      on(te, "compositionstart", function() {
-        var start = cm.getCursor("from");
-        if (input.composing) input.composing.range.clear()
-        input.composing = {
-          start: start,
-          range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
-        };
-      });
-      on(te, "compositionend", function() {
-        if (input.composing) {
-          input.poll();
-          input.composing.range.clear();
-          input.composing = null;
-        }
-      });
-    },
-
-    prepareSelection: function() {
-      // Redraw the selection and/or cursor
-      var cm = this.cm, display = cm.display, doc = cm.doc;
-      var result = prepareSelection(cm);
-
-      // Move the hidden textarea near the cursor to prevent scrolling artifacts
-      if (cm.options.moveInputWithCursor) {
-        var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
-        var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
-        result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
-                                            headPos.top + lineOff.top - wrapOff.top));
-        result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
-                                             headPos.left + lineOff.left - wrapOff.left));
-      }
-
-      return result;
-    },
-
-    showSelection: function(drawn) {
-      var cm = this.cm, display = cm.display;
-      removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
-      removeChildrenAndAdd(display.selectionDiv, drawn.selection);
-      if (drawn.teTop != null) {
-        this.wrapper.style.top = drawn.teTop + "px";
-        this.wrapper.style.left = drawn.teLeft + "px";
-      }
-    },
-
-    // Reset the input to correspond to the selection (or to be empty,
-    // when not typing and nothing is selected)
-    reset: function(typing) {
-      if (this.contextMenuPending) return;
-      var minimal, selected, cm = this.cm, doc = cm.doc;
-      if (cm.somethingSelected()) {
-        this.prevInput = "";
-        var range = doc.sel.primary();
-        minimal = hasCopyEvent &&
-          (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
-        var content = minimal ? "-" : selected || cm.getSelection();
-        this.textarea.value = content;
-        if (cm.state.focused) selectInput(this.textarea);
-        if (ie && ie_version >= 9) this.hasSelection = content;
-      } else if (!typing) {
-        this.prevInput = this.textarea.value = "";
-        if (ie && ie_version >= 9) this.hasSelection = null;
-      }
-      this.inaccurateSelection = minimal;
-    },
-
-    getField: function() { return this.textarea; },
-
-    supportsTouch: function() { return false; },
-
-    focus: function() {
-      if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
-        try { this.textarea.focus(); }
-        catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
-      }
-    },
-
-    blur: function() { this.textarea.blur(); },
-
-    resetPosition: function() {
-      this.wrapper.style.top = this.wrapper.style.left = 0;
-    },
-
-    receivedFocus: function() { this.slowPoll(); },
-
-    // Poll for input changes, using the normal rate of polling. This
-    // runs as long as the editor is focused.
-    slowPoll: function() {
-      var input = this;
-      if (input.pollingFast) return;
-      input.polling.set(this.cm.options.pollInterval, function() {
-        input.poll();
-        if (input.cm.state.focused) input.slowPoll();
-      });
-    },
-
-    // When an event has just come in that is likely to add or change
-    // something in the input textarea, we poll faster, to ensure that
-    // the change appears on the screen quickly.
-    fastPoll: function() {
-      var missed = false, input = this;
-      input.pollingFast = true;
-      function p() {
-        var changed = input.poll();
-        if (!changed && !missed) {missed = true; input.polling.set(60, p);}
-        else {input.pollingFast = false; input.slowPoll();}
-      }
-      input.polling.set(20, p);
-    },
-
-    // Read input from the textarea, and update the document to match.
-    // When something is selected, it is present in the textarea, and
-    // selected (unless it is huge, in which case a placeholder is
-    // used). When nothing is selected, the cursor sits after previously
-    // seen text (can be empty), which is stored in prevInput (we must
-    // not reset the textarea when typing, because that breaks IME).
-    poll: function() {
-      var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
-      // Since this is called a *lot*, try to bail out as cheaply as
-      // possible when it is clear that nothing happened. hasSelection
-      // will be the case when there is a lot of text in the textarea,
-      // in which case reading its value would be expensive.
-      if (this.contextMenuPending || !cm.state.focused ||
-          (hasSelection(input) && !prevInput && !this.composing) ||
-          cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
-        return false;
-
-      var text = input.value;
-      // If nothing changed, bail.
-      if (text == prevInput && !cm.somethingSelected()) return false;
-      // Work around nonsensical selection resetting in IE9/10, and
-      // inexplicable appearance of private area unicode characters on
-      // some key combos in Mac (#2689).
-      if (ie && ie_version >= 9 && this.hasSelection === text ||
-          mac && /[\uf700-\uf7ff]/.test(text)) {
-        cm.display.input.reset();
-        return false;
-      }
-
-      if (cm.doc.sel == cm.display.selForContextMenu) {
-        var first = text.charCodeAt(0);
-        if (first == 0x200b && !prevInput) prevInput = "\u200b";
-        if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo"); }
-      }
-      // Find the part of the input that is actually new
-      var same = 0, l = Math.min(prevInput.length, text.length);
-      while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
-
-      var self = this;
-      runInOp(cm, function() {
-        applyTextInput(cm, text.slice(same), prevInput.length - same,
-                       null, self.composing ? "*compose" : null);
-
-        // Don't leave long text in the textarea, since it makes further polling slow
-        if (text.length > 1000 || text.indexOf("\n") > -1) input.value = self.prevInput = "";
-        else self.prevInput = text;
-
-        if (self.composing) {
-          self.composing.range.clear();
-          self.composing.range = cm.markText(self.composing.start, cm.getCursor("to"),
-                                             {className: "CodeMirror-composing"});
-        }
-      });
-      return true;
-    },
-
-    ensurePolled: function() {
-      if (this.pollingFast && this.poll()) this.pollingFast = false;
-    },
-
-    onKeyPress: function() {
-      if (ie && ie_version >= 9) this.hasSelection = null;
-      this.fastPoll();
-    },
-
-    onContextMenu: function(e) {
-      var input = this, cm = input.cm, display = cm.display, te = input.textarea;
-      var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
-      if (!pos || presto) return; // Opera is difficult.
-
-      // Reset the current text selection only if the click is done outside of the selection
-      // and 'resetSelectionOnContextMenu' option is true.
-      var reset = cm.options.resetSelectionOnContextMenu;
-      if (reset && cm.doc.sel.contains(pos) == -1)
-        operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
-
-      var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
-      input.wrapper.style.cssText = "position: absolute"
-      var wrapperBox = input.wrapper.getBoundingClientRect()
-      te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) +
-        "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " +
-        (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
-        "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
-      if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
-      display.input.focus();
-      if (webkit) window.scrollTo(null, oldScrollY);
-      display.input.reset();
-      // Adds "Select all" to context menu in FF
-      if (!cm.somethingSelected()) te.value = input.prevInput = " ";
-      input.contextMenuPending = true;
-      display.selForContextMenu = cm.doc.sel;
-      clearTimeout(display.detectingSelectAll);
-
-      // Select-all will be greyed out if there's nothing to select, so
-      // this adds a zero-width space so that we can later check whether
-      // it got selected.
-      function prepareSelectAllHack() {
-        if (te.selectionStart != null) {
-          var selected = cm.somethingSelected();
-          var extval = "\u200b" + (selected ? te.value : "");
-          te.value = "\u21da"; // Used to catch context-menu undo
-          te.value = extval;
-          input.prevInput = selected ? "" : "\u200b";
-          te.selectionStart = 1; te.selectionEnd = extval.length;
-          // Re-set this, in case some other handler touched the
-          // selection in the meantime.
-          display.selForContextMenu = cm.doc.sel;
-        }
-      }
-      function rehide() {
-        input.contextMenuPending = false;
-        input.wrapper.style.cssText = oldWrapperCSS
-        te.style.cssText = oldCSS;
-        if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
-
-        // Try to detect the user choosing select-all
-        if (te.selectionStart != null) {
-          if (!ie || (ie && ie_version < 9)) prepareSelectAllHack();
-          var i = 0, poll = function() {
-            if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
-                te.selectionEnd > 0 && input.prevInput == "\u200b")
-              operation(cm, commands.selectAll)(cm);
-            else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
-            else display.input.reset();
-          };
-          display.detectingSelectAll = setTimeout(poll, 200);
-        }
-      }
-
-      if (ie && ie_version >= 9) prepareSelectAllHack();
-      if (captureRightClick) {
-        e_stop(e);
-        var mouseup = function() {
-          off(window, "mouseup", mouseup);
-          setTimeout(rehide, 20);
-        };
-        on(window, "mouseup", mouseup);
-      } else {
-        setTimeout(rehide, 50);
-      }
-    },
-
-    readOnlyChanged: function(val) {
-      if (!val) this.reset();
-    },
-
-    setUneditable: nothing,
-
-    needsContentAttribute: false
-  }, TextareaInput.prototype);
-
-  // CONTENTEDITABLE INPUT STYLE
-
-  function ContentEditableInput(cm) {
-    this.cm = cm;
-    this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
-    this.polling = new Delayed();
-    this.gracePeriod = false;
-  }
-
-  ContentEditableInput.prototype = copyObj({
-    init: function(display) {
-      var input = this, cm = input.cm;
-      var div = input.div = display.lineDiv;
-      disableBrowserMagic(div);
-
-      on(div, "paste", function(e) {
-        if (!signalDOMEvent(cm, e)) handlePaste(e, cm);
-      })
-
-      on(div, "compositionstart", function(e) {
-        var data = e.data;
-        input.composing = {sel: cm.doc.sel, data: data, startData: data};
-        if (!data) return;
-        var prim = cm.doc.sel.primary();
-        var line = cm.getLine(prim.head.line);
-        var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length));
-        if (found > -1 && found <= prim.head.ch)
-          input.composing.sel = simpleSelection(Pos(prim.head.line, found),
-                                                Pos(prim.head.line, found + data.length));
-      });
-      on(div, "compositionupdate", function(e) {
-        input.composing.data = e.data;
-      });
-      on(div, "compositionend", function(e) {
-        var ours = input.composing;
-        if (!ours) return;
-        if (e.data != ours.startData && !/\u200b/.test(e.data))
-          ours.data = e.data;
-        // Need a small delay to prevent other code (input event,
-        // selection polling) from doing damage when fired right after
-        // compositionend.
-        setTimeout(function() {
-          if (!ours.handled)
-            input.applyComposition(ours);
-          if (input.composing == ours)
-            input.composing = null;
-        }, 50);
-      });
-
-      on(div, "touchstart", function() {
-        input.forceCompositionEnd();
-      });
-
-      on(div, "input", function() {
-        if (input.composing) return;
-        if (cm.isReadOnly() || !input.pollContent())
-          runInOp(input.cm, function() {regChange(cm);});
-      });
-
-      function onCopyCut(e) {
-        if (signalDOMEvent(cm, e)) return
-        if (cm.somethingSelected()) {
-          lastCopied = {lineWise: false, text: cm.getSelections()};
-          if (e.type == "cut") cm.replaceSelection("", null, "cut");
-        } else if (!cm.options.lineWiseCopyCut) {
-          return;
-        } else {
-          var ranges = copyableRanges(cm);
-          lastCopied = {lineWise: true, text: ranges.text};
-          if (e.type == "cut") {
-            cm.operation(function() {
-              cm.setSelections(ranges.ranges, 0, sel_dontScroll);
-              cm.replaceSelection("", null, "cut");
-            });
-          }
-        }
-        // iOS exposes the clipboard API, but seems to discard content inserted into it
-        if (e.clipboardData && !ios) {
-          e.preventDefault();
-          e.clipboardData.clearData();
-          e.clipboardData.setData("text/plain", lastCopied.text.join("\n"));
-        } else {
-          // Old-fashioned briefly-focus-a-textarea hack
-          var kludge = hiddenTextarea(), te = kludge.firstChild;
-          cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
-          te.value = lastCopied.text.join("\n");
-          var hadFocus = document.activeElement;
-          selectInput(te);
-          setTimeout(function() {
-            cm.display.lineSpace.removeChild(kludge);
-            hadFocus.focus();
-          }, 50);
-        }
-      }
-      on(div, "copy", onCopyCut);
-      on(div, "cut", onCopyCut);
-    },
-
-    prepareSelection: function() {
-      var result = prepareSelection(this.cm, false);
-      result.focus = this.cm.state.focused;
-      return result;
-    },
-
-    showSelection: function(info, takeFocus) {
-      if (!info || !this.cm.display.view.length) return;
-      if (info.focus || takeFocus) this.showPrimarySelection();
-      this.showMultipleSelections(info);
-    },
-
-    showPrimarySelection: function() {
-      var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
-      var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
-      var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
-      if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
-          cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
-          cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
-        return;
-
-      var start = posToDOM(this.cm, prim.from());
-      var end = posToDOM(this.cm, prim.to());
-      if (!start && !end) return;
-
-      var view = this.cm.display.view;
-      var old = sel.rangeCount && sel.getRangeAt(0);
-      if (!start) {
-        start = {node: view[0].measure.map[2], offset: 0};
-      } else if (!end) { // FIXME dangerously hacky
-        var measure = view[view.length - 1].measure;
-        var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
-        end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
-      }
-
-      try { var rng = range(start.node, start.offset, end.offset, end.node); }
-      catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
-      if (rng) {
-        if (!gecko && this.cm.state.focused) {
-          sel.collapse(start.node, start.offset);
-          if (!rng.collapsed) sel.addRange(rng);
-        } else {
-          sel.removeAllRanges();
-          sel.addRange(rng);
-        }
-        if (old && sel.anchorNode == null) sel.addRange(old);
-        else if (gecko) this.startGracePeriod();
-      }
-      this.rememberSelection();
-    },
-
-    startGracePeriod: function() {
-      var input = this;
-      clearTimeout(this.gracePeriod);
-      this.gracePeriod = setTimeout(function() {
-        input.gracePeriod = false;
-        if (input.selectionChanged())
-          input.cm.operation(function() { input.cm.curOp.selectionChanged = true; });
-      }, 20);
-    },
-
-    showMultipleSelections: function(info) {
-      removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
-      removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
-    },
-
-    rememberSelection: function() {
-      var sel = window.getSelection();
-      this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
-      this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
-    },
-
-    selectionInEditor: function() {
-      var sel = window.getSelection();
-      if (!sel.rangeCount) return false;
-      var node = sel.getRangeAt(0).commonAncestorContainer;
-      return contains(this.div, node);
-    },
-
-    focus: function() {
-      if (this.cm.options.readOnly != "nocursor") this.div.focus();
-    },
-    blur: function() { this.div.blur(); },
-    getField: function() { return this.div; },
-
-    supportsTouch: function() { return true; },
-
-    receivedFocus: function() {
-      var input = this;
-      if (this.selectionInEditor())
-        this.pollSelection();
-      else
-        runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true; });
-
-      function poll() {
-        if (input.cm.state.focused) {
-          input.pollSelection();
-          input.polling.set(input.cm.options.pollInterval, poll);
-        }
-      }
-      this.polling.set(this.cm.options.pollInterval, poll);
-    },
-
-    selectionChanged: function() {
-      var sel = window.getSelection();
-      return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
-        sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset;
-    },
-
-    pollSelection: function() {
-      if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
-        var sel = window.getSelection(), cm = this.cm;
-        this.rememberSelection();
-        var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
-        var head = domToPos(cm, sel.focusNode, sel.focusOffset);
-        if (anchor && head) runInOp(cm, function() {
-          setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
-          if (anchor.bad || head.bad) cm.curOp.selectionChanged = true;
-        });
-      }
-    },
-
-    pollContent: function() {
-      var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
-      var from = sel.from(), to = sel.to();
-      if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false;
-
-      var fromIndex;
-      if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
-        var fromLine = lineNo(display.view[0].line);
-        var fromNode = display.view[0].node;
-      } else {
-        var fromLine = lineNo(display.view[fromIndex].line);
-        var fromNode = display.view[fromIndex - 1].node.nextSibling;
-      }
-      var toIndex = findViewIndex(cm, to.line);
-      if (toIndex == display.view.length - 1) {
-        var toLine = display.viewTo - 1;
-        var toNode = display.lineDiv.lastChild;
-      } else {
-        var toLine = lineNo(display.view[toIndex + 1].line) - 1;
-        var toNode = display.view[toIndex + 1].node.previousSibling;
-      }
-
-      var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
-      var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
-      while (newText.length > 1 && oldText.length > 1) {
-        if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
-        else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
-        else break;
-      }
-
-      var cutFront = 0, cutEnd = 0;
-      var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
-      while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
-        ++cutFront;
-      var newBot = lst(newText), oldBot = lst(oldText);
-      var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
-                               oldBot.length - (oldText.length == 1 ? cutFront : 0));
-      while (cutEnd < maxCutEnd &&
-             newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
-        ++cutEnd;
-
-      newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
-      newText[0] = newText[0].slice(cutFront);
-
-      var chFrom = Pos(fromLine, cutFront);
-      var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
-      if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
-        replaceRange(cm.doc, newText, chFrom, chTo, "+input");
-        return true;
-      }
-    },
-
-    ensurePolled: function() {
-      this.forceCompositionEnd();
-    },
-    reset: function() {
-      this.forceCompositionEnd();
-    },
-    forceCompositionEnd: function() {
-      if (!this.composing || this.composing.handled) return;
-      this.applyComposition(this.composing);
-      this.composing.handled = true;
-      this.div.blur();
-      this.div.focus();
-    },
-    applyComposition: function(composing) {
-      if (this.cm.isReadOnly())
-        operation(this.cm, regChange)(this.cm)
-      else if (composing.data && composing.data != composing.startData)
-        operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
-    },
-
-    setUneditable: function(node) {
-      node.contentEditable = "false"
-    },
-
-    onKeyPress: function(e) {
-      e.preventDefault();
-      if (!this.cm.isReadOnly())
-        operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
-    },
-
-    readOnlyChanged: function(val) {
-      this.div.contentEditable = String(val != "nocursor")
-    },
-
-    onContextMenu: nothing,
-    resetPosition: nothing,
-
-    needsContentAttribute: true
-  }, ContentEditableInput.prototype);
-
-  function posToDOM(cm, pos) {
-    var view = findViewForLine(cm, pos.line);
-    if (!view || view.hidden) return null;
-    var line = getLine(cm.doc, pos.line);
-    var info = mapFromLineView(view, line, pos.line);
-
-    var order = getOrder(line), side = "left";
-    if (order) {
-      var partPos = getBidiPartAt(order, pos.ch);
-      side = partPos % 2 ? "right" : "left";
-    }
-    var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
-    result.offset = result.collapse == "right" ? result.end : result.start;
-    return result;
-  }
-
-  function badPos(pos, bad) { if (bad) pos.bad = true; return pos; }
-
-  function domToPos(cm, node, offset) {
-    var lineNode;
-    if (node == cm.display.lineDiv) {
-      lineNode = cm.display.lineDiv.childNodes[offset];
-      if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true);
-      node = null; offset = 0;
-    } else {
-      for (lineNode = node;; lineNode = lineNode.parentNode) {
-        if (!lineNode || lineNode == cm.display.lineDiv) return null;
-        if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
-      }
-    }
-    for (var i = 0; i < cm.display.view.length; i++) {
-      var lineView = cm.display.view[i];
-      if (lineView.node == lineNode)
-        return locateNodeInLineView(lineView, node, offset);
-    }
-  }
-
-  function locateNodeInLineView(lineView, node, offset) {
-    var wrapper = lineView.text.firstChild, bad = false;
-    if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true);
-    if (node == wrapper) {
-      bad = true;
-      node = wrapper.childNodes[offset];
-      offset = 0;
-      if (!node) {
-        var line = lineView.rest ? lst(lineView.rest) : lineView.line;
-        return badPos(Pos(lineNo(line), line.text.length), bad);
-      }
-    }
-
-    var textNode = node.nodeType == 3 ? node : null, topNode = node;
-    if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
-      textNode = node.firstChild;
-      if (offset) offset = textNode.nodeValue.length;
-    }
-    while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
-    var measure = lineView.measure, maps = measure.maps;
-
-    function find(textNode, topNode, offset) {
-      for (var i = -1; i < (maps ? maps.length : 0); i++) {
-        var map = i < 0 ? measure.map : maps[i];
-        for (var j = 0; j < map.length; j += 3) {
-          var curNode = map[j + 2];
-          if (curNode == textNode || curNode == topNode) {
-            var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
-            var ch = map[j] + offset;
-            if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)];
-            return Pos(line, ch);
-          }
-        }
-      }
-    }
-    var found = find(textNode, topNode, offset);
-    if (found) return badPos(found, bad);
-
-    // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
-    for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
-      found = find(after, after.firstChild, 0);
-      if (found)
-        return badPos(Pos(found.line, found.ch - dist), bad);
-      else
-        dist += after.textContent.length;
-    }
-    for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
-      found = find(before, before.firstChild, -1);
-      if (found)
-        return badPos(Pos(found.line, found.ch + dist), bad);
-      else
-        dist += after.textContent.length;
-    }
-  }
-
-  function domTextBetween(cm, from, to, fromLine, toLine) {
-    var text = "", closing = false, lineSep = cm.doc.lineSeparator();
-    function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
-    function walk(node) {
-      if (node.nodeType == 1) {
-        var cmText = node.getAttribute("cm-text");
-        if (cmText != null) {
-          if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "");
-          text += cmText;
-          return;
-        }
-        var markerID = node.getAttribute("cm-marker"), range;
-        if (markerID) {
-          var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
-          if (found.length && (range = found[0].find()))
-            text += getBetween(cm.doc, range.from, range.to).join(lineSep);
-          return;
-        }
-        if (node.getAttribute("contenteditable") == "false") return;
-        for (var i = 0; i < node.childNodes.length; i++)
-          walk(node.childNodes[i]);
-        if (/^(pre|div|p)$/i.test(node.nodeName))
-          closing = true;
-      } else if (node.nodeType == 3) {
-        var val = node.nodeValue;
-        if (!val) return;
-        if (closing) {
-          text += lineSep;
-          closing = false;
-        }
-        text += val;
-      }
-    }
-    for (;;) {
-      walk(from);
-      if (from == to) break;
-      from = from.nextSibling;
-    }
-    return text;
-  }
-
-  CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
-
-  // SELECTION / CURSOR
-
-  // Selection objects are immutable. A new one is created every time
-  // the selection changes. A selection is one or more non-overlapping
-  // (and non-touching) ranges, sorted, and an integer that indicates
-  // which one is the primary selection (the one that's scrolled into
-  // view, that getCursor returns, etc).
-  function Selection(ranges, primIndex) {
-    this.ranges = ranges;
-    this.primIndex = primIndex;
-  }
-
-  Selection.prototype = {
-    primary: function() { return this.ranges[this.primIndex]; },
-    equals: function(other) {
-      if (other == this) return true;
-      if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false;
-      for (var i = 0; i < this.ranges.length; i++) {
-        var here = this.ranges[i], there = other.ranges[i];
-        if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false;
-      }
-      return true;
-    },
-    deepCopy: function() {
-      for (var out = [], i = 0; i < this.ranges.length; i++)
-        out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head));
-      return new Selection(out, this.primIndex);
-    },
-    somethingSelected: function() {
-      for (var i = 0; i < this.ranges.length; i++)
-        if (!this.ranges[i].empty()) return true;
-      return false;
-    },
-    contains: function(pos, end) {
-      if (!end) end = pos;
-      for (var i = 0; i < this.ranges.length; i++) {
-        var range = this.ranges[i];
-        if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
-          return i;
-      }
-      return -1;
-    }
-  };
-
-  function Range(anchor, head) {
-    this.anchor = anchor; this.head = head;
-  }
-
-  Range.prototype = {
-    from: function() { return minPos(this.anchor, this.head); },
-    to: function() { return maxPos(this.anchor, this.head); },
-    empty: function() {
-      return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch;
-    }
-  };
-
-  // Take an unsorted, potentially overlapping set of ranges, and
-  // build a selection out of it. 'Consumes' ranges array (modifying
-  // it).
-  function normalizeSelection(ranges, primIndex) {
-    var prim = ranges[primIndex];
-    ranges.sort(function(a, b) { return cmp(a.from(), b.from()); });
-    primIndex = indexOf(ranges, prim);
-    for (var i = 1; i < ranges.length; i++) {
-      var cur = ranges[i], prev = ranges[i - 1];
-      if (cmp(prev.to(), cur.from()) >= 0) {
-        var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
-        var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head;
-        if (i <= primIndex) --primIndex;
-        ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to));
-      }
-    }
-    return new Selection(ranges, primIndex);
-  }
-
-  function simpleSelection(anchor, head) {
-    return new Selection([new Range(anchor, head || anchor)], 0);
-  }
-
-  // Most of the external API clips given positions to make sure they
-  // actually exist within the document.
-  function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));}
-  function clipPos(doc, pos) {
-    if (pos.line < doc.first) return Pos(doc.first, 0);
-    var last = doc.first + doc.size - 1;
-    if (pos.line > last) return Pos(last, getLine(doc, last).text.length);
-    return clipToLen(pos, getLine(doc, pos.line).text.length);
-  }
-  function clipToLen(pos, linelen) {
-    var ch = pos.ch;
-    if (ch == null || ch > linelen) return Pos(pos.line, linelen);
-    else if (ch < 0) return Pos(pos.line, 0);
-    else return pos;
-  }
-  function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
-  function clipPosArray(doc, array) {
-    for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]);
-    return out;
-  }
-
-  // SELECTION UPDATES
-
-  // The 'scroll' parameter given to many of these indicated whether
-  // the new cursor position should be scrolled into view after
-  // modifying the selection.
-
-  // If shift is held or the extend flag is set, extends a range to
-  // include a given position (and optionally a second position).
-  // Otherwise, simply returns the range between the given positions.
-  // Used for cursor motion and such.
-  function extendRange(doc, range, head, other) {
-    if (doc.cm && doc.cm.display.shift || doc.extend) {
-      var anchor = range.anchor;
-      if (other) {
-        var posBefore = cmp(head, anchor) < 0;
-        if (posBefore != (cmp(other, anchor) < 0)) {
-          anchor = head;
-          head = other;
-        } else if (posBefore != (cmp(head, other) < 0)) {
-          head = other;
-        }
-      }
-      return new Range(anchor, head);
-    } else {
-      return new Range(other || head, head);
-    }
-  }
-
-  // Extend the primary selection range, discard the rest.
-  function extendSelection(doc, head, other, options) {
-    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options);
-  }
-
-  // Extend all selections (pos is an array of selections with length
-  // equal the number of selections)
-  function extendSelections(doc, heads, options) {
-    for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
-      out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
-    var newSel = normalizeSelection(out, doc.sel.primIndex);
-    setSelection(doc, newSel, options);
-  }
-
-  // Updates a single range in the selection.
-  function replaceOneSelection(doc, i, range, options) {
-    var ranges = doc.sel.ranges.slice(0);
-    ranges[i] = range;
-    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options);
-  }
-
-  // Reset the selection to a single range.
-  function setSimpleSelection(doc, anchor, head, options) {
-    setSelection(doc, simpleSelection(anchor, head), options);
-  }
-
-  // Give beforeSelectionChange handlers a change to influence a
-  // selection update.
-  function filterSelectionChange(doc, sel, options) {
-    var obj = {
-      ranges: sel.ranges,
-      update: function(ranges) {
-        this.ranges = [];
-        for (var i = 0; i < ranges.length; i++)
-          this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
-                                     clipPos(doc, ranges[i].head));
-      },
-      origin: options && options.origin
-    };
-    signal(doc, "beforeSelectionChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
-    if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1);
-    else return sel;
-  }
-
-  function setSelectionReplaceHistory(doc, sel, options) {
-    var done = doc.history.done, last = lst(done);
-    if (last && last.ranges) {
-      done[done.length - 1] = sel;
-      setSelectionNoUndo(doc, sel, options);
-    } else {
-      setSelection(doc, sel, options);
-    }
-  }
-
-  // Set a new selection.
-  function setSelection(doc, sel, options) {
-    setSelectionNoUndo(doc, sel, options);
-    addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
-  }
-
-  function setSelectionNoUndo(doc, sel, options) {
-    if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
-      sel = filterSelectionChange(doc, sel, options);
-
-    var bias = options && options.bias ||
-      (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
-    setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
-
-    if (!(options && options.scroll === false) && doc.cm)
-      ensureCursorVisible(doc.cm);
-  }
-
-  function setSelectionInner(doc, sel) {
-    if (sel.equals(doc.sel)) return;
-
-    doc.sel = sel;
-
-    if (doc.cm) {
-      doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true;
-      signalCursorActivity(doc.cm);
-    }
-    signalLater(doc, "cursorActivity", doc);
-  }
-
-  // Verify that the selection does not partially select any atomic
-  // marked ranges.
-  function reCheckSelection(doc) {
-    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll);
-  }
-
-  // Return a selection that does not partially select any atomic
-  // ranges.
-  function skipAtomicInSelection(doc, sel, bias, mayClear) {
-    var out;
-    for (var i = 0; i < sel.ranges.length; i++) {
-      var range = sel.ranges[i];
-      var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
-      var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
-      var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);
-      if (out || newAnchor != range.anchor || newHead != range.head) {
-        if (!out) out = sel.ranges.slice(0, i);
-        out[i] = new Range(newAnchor, newHead);
-      }
-    }
-    return out ? normalizeSelection(out, sel.primIndex) : sel;
-  }
-
-  function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
-    var line = getLine(doc, pos.line);
-    if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-      var sp = line.markedSpans[i], m = sp.marker;
-      if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
-          (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
-        if (mayClear) {
-          signal(m, "beforeCursorEnter");
-          if (m.explicitlyCleared) {
-            if (!line.markedSpans) break;
-            else {--i; continue;}
-          }
-        }
-        if (!m.atomic) continue;
-
-        if (oldPos) {
-          var near = m.find(dir < 0 ? 1 : -1), diff;
-          if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
-            near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null);
-          if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
-            return skipAtomicInner(doc, near, pos, dir, mayClear);
-        }
-
-        var far = m.find(dir < 0 ? -1 : 1);
-        if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
-          far = movePos(doc, far, dir, far.line == pos.line ? line : null);
-        return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null;
-      }
-    }
-    return pos;
-  }
-
-  // Ensure a given position is not inside an atomic range.
-  function skipAtomic(doc, pos, oldPos, bias, mayClear) {
-    var dir = bias || 1;
-    var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
-        (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
-        skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
-        (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
-    if (!found) {
-      doc.cantEdit = true;
-      return Pos(doc.first, 0);
-    }
-    return found;
-  }
-
-  function movePos(doc, pos, dir, line) {
-    if (dir < 0 && pos.ch == 0) {
-      if (pos.line > doc.first) return clipPos(doc, Pos(pos.line - 1));
-      else return null;
-    } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
-      if (pos.line < doc.first + doc.size - 1) return Pos(pos.line + 1, 0);
-      else return null;
-    } else {
-      return new Pos(pos.line, pos.ch + dir);
-    }
-  }
-
-  // SELECTION DRAWING
-
-  function updateSelection(cm) {
-    cm.display.input.showSelection(cm.display.input.prepareSelection());
-  }
-
-  function prepareSelection(cm, primary) {
-    var doc = cm.doc, result = {};
-    var curFragment = result.cursors = document.createDocumentFragment();
-    var selFragment = result.selection = document.createDocumentFragment();
-
-    for (var i = 0; i < doc.sel.ranges.length; i++) {
-      if (primary === false && i == doc.sel.primIndex) continue;
-      var range = doc.sel.ranges[i];
-      if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue;
-      var collapsed = range.empty();
-      if (collapsed || cm.options.showCursorWhenSelecting)
-        drawSelectionCursor(cm, range.head, curFragment);
-      if (!collapsed)
-        drawSelectionRange(cm, range, selFragment);
-    }
-    return result;
-  }
-
-  // Draws a cursor for the given range
-  function drawSelectionCursor(cm, head, output) {
-    var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
-
-    var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
-    cursor.style.left = pos.left + "px";
-    cursor.style.top = pos.top + "px";
-    cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
-
-    if (pos.other) {
-      // Secondary cursor, shown when on a 'jump' in bi-directional text
-      var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
-      otherCursor.style.display = "";
-      otherCursor.style.left = pos.other.left + "px";
-      otherCursor.style.top = pos.other.top + "px";
-      otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
-    }
-  }
-
-  // Draws the given range as a highlighted selection
-  function drawSelectionRange(cm, range, output) {
-    var display = cm.display, doc = cm.doc;
-    var fragment = document.createDocumentFragment();
-    var padding = paddingH(cm.display), leftSide = padding.left;
-    var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
-
-    function add(left, top, width, bottom) {
-      if (top < 0) top = 0;
-      top = Math.round(top);
-      bottom = Math.round(bottom);
-      fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
-                               "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) +
-                               "px; height: " + (bottom - top) + "px"));
-    }
-
-    function drawForLine(line, fromArg, toArg) {
-      var lineObj = getLine(doc, line);
-      var lineLen = lineObj.text.length;
-      var start, end;
-      function coords(ch, bias) {
-        return charCoords(cm, Pos(line, ch), "div", lineObj, bias);
-      }
-
-      iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
-        var leftPos = coords(from, "left"), rightPos, left, right;
-        if (from == to) {
-          rightPos = leftPos;
-          left = right = leftPos.left;
-        } else {
-          rightPos = coords(to - 1, "right");
-          if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; }
-          left = leftPos.left;
-          right = rightPos.right;
-        }
-        if (fromArg == null && from == 0) left = leftSide;
-        if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
-          add(left, leftPos.top, null, leftPos.bottom);
-          left = leftSide;
-          if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top);
-        }
-        if (toArg == null && to == lineLen) right = rightSide;
-        if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
-          start = leftPos;
-        if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
-          end = rightPos;
-        if (left < leftSide + 1) left = leftSide;
-        add(left, rightPos.top, right - left, rightPos.bottom);
-      });
-      return {start: start, end: end};
-    }
-
-    var sFrom = range.from(), sTo = range.to();
-    if (sFrom.line == sTo.line) {
-      drawForLine(sFrom.line, sFrom.ch, sTo.ch);
-    } else {
-      var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
-      var singleVLine = visualLine(fromLine) == visualLine(toLine);
-      var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end;
-      var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
-      if (singleVLine) {
-        if (leftEnd.top < rightStart.top - 2) {
-          add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
-          add(leftSide, rightStart.top, rightStart.left, rightStart.bottom);
-        } else {
-          add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
-        }
-      }
-      if (leftEnd.bottom < rightStart.top)
-        add(leftSide, leftEnd.bottom, null, rightStart.top);
-    }
-
-    output.appendChild(fragment);
-  }
-
-  // Cursor-blinking
-  function restartBlink(cm) {
-    if (!cm.state.focused) return;
-    var display = cm.display;
-    clearInterval(display.blinker);
-    var on = true;
-    display.cursorDiv.style.visibility = "";
-    if (cm.options.cursorBlinkRate > 0)
-      display.blinker = setInterval(function() {
-        display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
-      }, cm.options.cursorBlinkRate);
-    else if (cm.options.cursorBlinkRate < 0)
-      display.cursorDiv.style.visibility = "hidden";
-  }
-
-  // HIGHLIGHT WORKER
-
-  function startWorker(cm, time) {
-    if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
-      cm.state.highlight.set(time, bind(highlightWorker, cm));
-  }
-
-  function highlightWorker(cm) {
-    var doc = cm.doc;
-    if (doc.frontier < doc.first) doc.frontier = doc.first;
-    if (doc.frontier >= cm.display.viewTo) return;
-    var end = +new Date + cm.options.workTime;
-    var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
-    var changedLines = [];
-
-    doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
-      if (doc.frontier >= cm.display.viewFrom) { // Visible
-        var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength;
-        var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true);
-        line.styles = highlighted.styles;
-        var oldCls = line.styleClasses, newCls = highlighted.classes;
-        if (newCls) line.styleClasses = newCls;
-        else if (oldCls) line.styleClasses = null;
-        var ischange = !oldStyles || oldStyles.length != line.styles.length ||
-          oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
-        for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
-        if (ischange) changedLines.push(doc.frontier);
-        line.stateAfter = tooLong ? state : copyState(doc.mode, state);
-      } else {
-        if (line.text.length <= cm.options.maxHighlightLength)
-          processLine(cm, line.text, state);
-        line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
-      }
-      ++doc.frontier;
-      if (+new Date > end) {
-        startWorker(cm, cm.options.workDelay);
-        return true;
-      }
-    });
-    if (changedLines.length) runInOp(cm, function() {
-      for (var i = 0; i < changedLines.length; i++)
-        regLineChange(cm, changedLines[i], "text");
-    });
-  }
-
-  // Finds the line to start with when starting a parse. Tries to
-  // find a line with a stateAfter, so that it can start with a
-  // valid state. If that fails, it returns the line with the
-  // smallest indentation, which tends to need the least context to
-  // parse correctly.
-  function findStartLine(cm, n, precise) {
-    var minindent, minline, doc = cm.doc;
-    var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
-    for (var search = n; search > lim; --search) {
-      if (search <= doc.first) return doc.first;
-      var line = getLine(doc, search - 1);
-      if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
-      var indented = countColumn(line.text, null, cm.options.tabSize);
-      if (minline == null || minindent > indented) {
-        minline = search - 1;
-        minindent = indented;
-      }
-    }
-    return minline;
-  }
-
-  function getStateBefore(cm, n, precise) {
-    var doc = cm.doc, display = cm.display;
-    if (!doc.mode.startState) return true;
-    var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
-    if (!state) state = startState(doc.mode);
-    else state = copyState(doc.mode, state);
-    doc.iter(pos, n, function(line) {
-      processLine(cm, line.text, state);
-      var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo;
-      line.stateAfter = save ? copyState(doc.mode, state) : null;
-      ++pos;
-    });
-    if (precise) doc.frontier = pos;
-    return state;
-  }
-
-  // POSITION MEASUREMENT
-
-  function paddingTop(display) {return display.lineSpace.offsetTop;}
-  function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;}
-  function paddingH(display) {
-    if (display.cachedPaddingH) return display.cachedPaddingH;
-    var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
-    var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
-    var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
-    if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data;
-    return data;
-  }
-
-  function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth; }
-  function displayWidth(cm) {
-    return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth;
-  }
-  function displayHeight(cm) {
-    return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight;
-  }
-
-  // Ensure the lineView.wrapping.heights array is populated. This is
-  // an array of bottom offsets for the lines that make up a drawn
-  // line. When lineWrapping is on, there might be more than one
-  // height.
-  function ensureLineHeights(cm, lineView, rect) {
-    var wrapping = cm.options.lineWrapping;
-    var curWidth = wrapping && displayWidth(cm);
-    if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
-      var heights = lineView.measure.heights = [];
-      if (wrapping) {
-        lineView.measure.width = curWidth;
-        var rects = lineView.text.firstChild.getClientRects();
-        for (var i = 0; i < rects.length - 1; i++) {
-          var cur = rects[i], next = rects[i + 1];
-          if (Math.abs(cur.bottom - next.bottom) > 2)
-            heights.push((cur.bottom + next.top) / 2 - rect.top);
-        }
-      }
-      heights.push(rect.bottom - rect.top);
-    }
-  }
-
-  // Find a line map (mapping character offsets to text nodes) and a
-  // measurement cache for the given line number. (A line view might
-  // contain multiple lines when collapsed ranges are present.)
-  function mapFromLineView(lineView, line, lineN) {
-    if (lineView.line == line)
-      return {map: lineView.measure.map, cache: lineView.measure.cache};
-    for (var i = 0; i < lineView.rest.length; i++)
-      if (lineView.rest[i] == line)
-        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]};
-    for (var i = 0; i < lineView.rest.length; i++)
-      if (lineNo(lineView.rest[i]) > lineN)
-        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true};
-  }
-
-  // Render a line into the hidden node display.externalMeasured. Used
-  // when measurement is needed for a line that's not in the viewport.
-  function updateExternalMeasurement(cm, line) {
-    line = visualLine(line);
-    var lineN = lineNo(line);
-    var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
-    view.lineN = lineN;
-    var built = view.built = buildLineContent(cm, view);
-    view.text = built.pre;
-    removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
-    return view;
-  }
-
-  // Get a {top, bottom, left, right} box (in line-local coordinates)
-  // for a given character.
-  function measureChar(cm, line, ch, bias) {
-    return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias);
-  }
-
-  // Find a line view that corresponds to the given line number.
-  function findViewForLine(cm, lineN) {
-    if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
-      return cm.display.view[findViewIndex(cm, lineN)];
-    var ext = cm.display.externalMeasured;
-    if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
-      return ext;
-  }
-
-  // Measurement can be split in two steps, the set-up work that
-  // applies to the whole line, and the measurement of the actual
-  // character. Functions like coordsChar, that need to do a lot of
-  // measurements in a row, can thus ensure that the set-up work is
-  // only done once.
-  function prepareMeasureForLine(cm, line) {
-    var lineN = lineNo(line);
-    var view = findViewForLine(cm, lineN);
-    if (view && !view.text) {
-      view = null;
-    } else if (view && view.changes) {
-      updateLineForChanges(cm, view, lineN, getDimensions(cm));
-      cm.curOp.forceUpdate = true;
-    }
-    if (!view)
-      view = updateExternalMeasurement(cm, line);
-
-    var info = mapFromLineView(view, line, lineN);
-    return {
-      line: line, view: view, rect: null,
-      map: info.map, cache: info.cache, before: info.before,
-      hasHeights: false
-    };
-  }
-
-  // Given a prepared measurement object, measures the position of an
-  // actual character (or fetches it from the cache).
-  function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
-    if (prepared.before) ch = -1;
-    var key = ch + (bias || ""), found;
-    if (prepared.cache.hasOwnProperty(key)) {
-      found = prepared.cache[key];
-    } else {
-      if (!prepared.rect)
-        prepared.rect = prepared.view.text.getBoundingClientRect();
-      if (!prepared.hasHeights) {
-        ensureLineHeights(cm, prepared.view, prepared.rect);
-        prepared.hasHeights = true;
-      }
-      found = measureCharInner(cm, prepared, ch, bias);
-      if (!found.bogus) prepared.cache[key] = found;
-    }
-    return {left: found.left, right: found.right,
-            top: varHeight ? found.rtop : found.top,
-            bottom: varHeight ? found.rbottom : found.bottom};
-  }
-
-  var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
-
-  function nodeAndOffsetInLineMap(map, ch, bias) {
-    var node, start, end, collapse;
-    // First, search the line map for the text node corresponding to,
-    // or closest to, the target character.
-    for (var i = 0; i < map.length; i += 3) {
-      var mStart = map[i], mEnd = map[i + 1];
-      if (ch < mStart) {
-        start = 0; end = 1;
-        collapse = "left";
-      } else if (ch < mEnd) {
-        start = ch - mStart;
-        end = start + 1;
-      } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) {
-        end = mEnd - mStart;
-        start = end - 1;
-        if (ch >= mEnd) collapse = "right";
-      }
-      if (start != null) {
-        node = map[i + 2];
-        if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
-          collapse = bias;
-        if (bias == "left" && start == 0)
-          while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) {
-            node = map[(i -= 3) + 2];
-            collapse = "left";
-          }
-        if (bias == "right" && start == mEnd - mStart)
-          while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) {
-            node = map[(i += 3) + 2];
-            collapse = "right";
-          }
-        break;
-      }
-    }
-    return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
-  }
-
-  function getUsefulRect(rects, bias) {
-    var rect = nullRect
-    if (bias == "left") for (var i = 0; i < rects.length; i++) {
-      if ((rect = rects[i]).left != rect.right) break
-    } else for (var i = rects.length - 1; i >= 0; i--) {
-      if ((rect = rects[i]).left != rect.right) break
-    }
-    return rect
-  }
-
-  function measureCharInner(cm, prepared, ch, bias) {
-    var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
-    var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
-
-    var rect;
-    if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
-      for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
-        while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
-        while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
-        if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
-          rect = node.parentNode.getBoundingClientRect();
-        else
-          rect = getUsefulRect(range(node, start, end).getClientRects(), bias)
-        if (rect.left || rect.right || start == 0) break;
-        end = start;
-        start = start - 1;
-        collapse = "right";
-      }
-      if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
-    } else { // If it is a widget, simply get the box for the whole widget.
-      if (start > 0) collapse = bias = "right";
-      var rects;
-      if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
-        rect = rects[bias == "right" ? rects.length - 1 : 0];
-      else
-        rect = node.getBoundingClientRect();
-    }
-    if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
-      var rSpan = node.parentNode.getClientRects()[0];
-      if (rSpan)
-        rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
-      else
-        rect = nullRect;
-    }
-
-    var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
-    var mid = (rtop + rbot) / 2;
-    var heights = prepared.view.measure.heights;
-    for (var i = 0; i < heights.length - 1; i++)
-      if (mid < heights[i]) break;
-    var top = i ? heights[i - 1] : 0, bot = heights[i];
-    var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
-                  right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
-                  top: top, bottom: bot};
-    if (!rect.left && !rect.right) result.bogus = true;
-    if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
-
-    return result;
-  }
-
-  // Work around problem with bounding client rects on ranges being
-  // returned incorrectly when zoomed on IE10 and below.
-  function maybeUpdateRectForZooming(measure, rect) {
-    if (!window.screen || screen.logicalXDPI == null ||
-        screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
-      return rect;
-    var scaleX = screen.logicalXDPI / screen.deviceXDPI;
-    var scaleY = screen.logicalYDPI / screen.deviceYDPI;
-    return {left: rect.left * scaleX, right: rect.right * scaleX,
-            top: rect.top * scaleY, bottom: rect.bottom * scaleY};
-  }
-
-  function clearLineMeasurementCacheFor(lineView) {
-    if (lineView.measure) {
-      lineView.measure.cache = {};
-      lineView.measure.heights = null;
-      if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-        lineView.measure.caches[i] = {};
-    }
-  }
-
-  function clearLineMeasurementCache(cm) {
-    cm.display.externalMeasure = null;
-    removeChildren(cm.display.lineMeasure);
-    for (var i = 0; i < cm.display.view.length; i++)
-      clearLineMeasurementCacheFor(cm.display.view[i]);
-  }
-
-  function clearCaches(cm) {
-    clearLineMeasurementCache(cm);
-    cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
-    if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;
-    cm.display.lineNumChars = null;
-  }
-
-  function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; }
-  function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; }
-
-  // Converts a {top, bottom, left, right} box from line-local
-  // coordinates into another coordinate system. Context may be one of
-  // "line", "div" (display.lineDiv), "local"/null (editor), "window",
-  // or "page".
-  function intoCoordSystem(cm, lineObj, rect, context) {
-    if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
-      var size = widgetHeight(lineObj.widgets[i]);
-      rect.top += size; rect.bottom += size;
-    }
-    if (context == "line") return rect;
-    if (!context) context = "local";
-    var yOff = heightAtLine(lineObj);
-    if (context == "local") yOff += paddingTop(cm.display);
-    else yOff -= cm.display.viewOffset;
-    if (context == "page" || context == "window") {
-      var lOff = cm.display.lineSpace.getBoundingClientRect();
-      yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
-      var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
-      rect.left += xOff; rect.right += xOff;
-    }
-    rect.top += yOff; rect.bottom += yOff;
-    return rect;
-  }
-
-  // Coverts a box from "div" coords to another coordinate system.
-  // Context may be "window", "page", "div", or "local"/null.
-  function fromCoordSystem(cm, coords, context) {
-    if (context == "div") return coords;
-    var left = coords.left, top = coords.top;
-    // First move into "page" coordinate system
-    if (context == "page") {
-      left -= pageScrollX();
-      top -= pageScrollY();
-    } else if (context == "local" || !context) {
-      var localBox = cm.display.sizer.getBoundingClientRect();
-      left += localBox.left;
-      top += localBox.top;
-    }
-
-    var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect();
-    return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};
-  }
-
-  function charCoords(cm, pos, context, lineObj, bias) {
-    if (!lineObj) lineObj = getLine(cm.doc, pos.line);
-    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context);
-  }
-
-  // Returns a box for a given cursor position, which may have an
-  // 'other' property containing the position of the secondary cursor
-  // on a bidi boundary.
-  function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
-    lineObj = lineObj || getLine(cm.doc, pos.line);
-    if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
-    function get(ch, right) {
-      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
-      if (right) m.left = m.right; else m.right = m.left;
-      return intoCoordSystem(cm, lineObj, m, context);
-    }
-    function getBidi(ch, partPos) {
-      var part = order[partPos], right = part.level % 2;
-      if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
-        part = order[--partPos];
-        ch = bidiRight(part) - (part.level % 2 ? 0 : 1);
-        right = true;
-      } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
-        part = order[++partPos];
-        ch = bidiLeft(part) - part.level % 2;
-        right = false;
-      }
-      if (right && ch == part.to && ch > part.from) return get(ch - 1);
-      return get(ch, right);
-    }
-    var order = getOrder(lineObj), ch = pos.ch;
-    if (!order) return get(ch);
-    var partPos = getBidiPartAt(order, ch);
-    var val = getBidi(ch, partPos);
-    if (bidiOther != null) val.other = getBidi(ch, bidiOther);
-    return val;
-  }
-
-  // Used to cheaply estimate the coordinates for a position. Used for
-  // intermediate scroll updates.
-  function estimateCoords(cm, pos) {
-    var left = 0, pos = clipPos(cm.doc, pos);
-    if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch;
-    var lineObj = getLine(cm.doc, pos.line);
-    var top = heightAtLine(lineObj) + paddingTop(cm.display);
-    return {left: left, right: left, top: top, bottom: top + lineObj.height};
-  }
-
-  // Positions returned by coordsChar contain some extra information.
-  // xRel is the relative x position of the input coordinates compared
-  // to the found position (so xRel > 0 means the coordinates are to
-  // the right of the character position, for example). When outside
-  // is true, that means the coordinates lie outside the line's
-  // vertical range.
-  function PosWithInfo(line, ch, outside, xRel) {
-    var pos = Pos(line, ch);
-    pos.xRel = xRel;
-    if (outside) pos.outside = true;
-    return pos;
-  }
-
-  // Compute the character position closest to the given coordinates.
-  // Input must be lineSpace-local ("div" coordinate system).
-  function coordsChar(cm, x, y) {
-    var doc = cm.doc;
-    y += cm.display.viewOffset;
-    if (y < 0) return PosWithInfo(doc.first, 0, true, -1);
-    var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
-    if (lineN > last)
-      return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1);
-    if (x < 0) x = 0;
-
-    var lineObj = getLine(doc, lineN);
-    for (;;) {
-      var found = coordsCharInner(cm, lineObj, lineN, x, y);
-      var merged = collapsedSpanAtEnd(lineObj);
-      var mergedPos = merged && merged.find(0, true);
-      if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
-        lineN = lineNo(lineObj = mergedPos.to.line);
-      else
-        return found;
-    }
-  }
-
-  function coordsCharInner(cm, lineObj, lineNo, x, y) {
-    var innerOff = y - heightAtLine(lineObj);
-    var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;
-    var preparedMeasure = prepareMeasureForLine(cm, lineObj);
-
-    function getX(ch) {
-      var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure);
-      wrongLine = true;
-      if (innerOff > sp.bottom) return sp.left - adjust;
-      else if (innerOff < sp.top) return sp.left + adjust;
-      else wrongLine = false;
-      return sp.left;
-    }
-
-    var bidi = getOrder(lineObj), dist = lineObj.text.length;
-    var from = lineLeft(lineObj), to = lineRight(lineObj);
-    var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine;
-
-    if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1);
-    // Do a binary search between these bounds.
-    for (;;) {
-      if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-        var ch = x < fromX || x - fromX <= toX - x ? from : to;
-        var outside = ch == from ? fromOutside : toOutside
-        var xDiff = x - (ch == from ? fromX : toX);
-        // This is a kludge to handle the case where the coordinates
-        // are after a line-wrapped line. We should replace it with a
-        // more general handling of cursor positions around line
-        // breaks. (Issue #4078)
-        if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
-            ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
-          var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right");
-          if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
-            outside = false
-            ch++
-            xDiff = x - charSize.right
-          }
-        }
-        while (isExtendingChar(lineObj.text.charAt(ch))) ++ch;
-        var pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
-        return pos;
-      }
-      var step = Math.ceil(dist / 2), middle = from + step;
-      if (bidi) {
-        middle = from;
-        for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1);
-      }
-      var middleX = getX(middle);
-      if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step;}
-      else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step;}
-    }
-  }
-
-  var measureText;
-  // Compute the default text height.
-  function textHeight(display) {
-    if (display.cachedTextHeight != null) return display.cachedTextHeight;
-    if (measureText == null) {
-      measureText = elt("pre");
-      // Measure a bunch of lines, for browsers that compute
-      // fractional heights.
-      for (var i = 0; i < 49; ++i) {
-        measureText.appendChild(document.createTextNode("x"));
-        measureText.appendChild(elt("br"));
-      }
-      measureText.appendChild(document.createTextNode("x"));
-    }
-    removeChildrenAndAdd(display.measure, measureText);
-    var height = measureText.offsetHeight / 50;
-    if (height > 3) display.cachedTextHeight = height;
-    removeChildren(display.measure);
-    return height || 1;
-  }
-
-  // Compute the default character width.
-  function charWidth(display) {
-    if (display.cachedCharWidth != null) return display.cachedCharWidth;
-    var anchor = elt("span", "xxxxxxxxxx");
-    var pre = elt("pre", [anchor]);
-    removeChildrenAndAdd(display.measure, pre);
-    var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
-    if (width > 2) display.cachedCharWidth = width;
-    return width || 10;
-  }
-
-  // OPERATIONS
-
-  // Operations are used to wrap a series of changes to the editor
-  // state in such a way that each change won't have to update the
-  // cursor and display (which would be awkward, slow, and
-  // error-prone). Instead, display updates are batched and then all
-  // combined and executed at once.
-
-  var operationGroup = null;
-
-  var nextOpId = 0;
-  // Start a new operation.
-  function startOperation(cm) {
-    cm.curOp = {
-      cm: cm,
-      viewChanged: false,      // Flag that indicates that lines might need to be redrawn
-      startHeight: cm.doc.height, // Used to detect need to update scrollbar
-      forceUpdate: false,      // Used to force a redraw
-      updateInput: null,       // Whether to reset the input textarea
-      typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
-      changeObjs: null,        // Accumulated changes, for firing change events
-      cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
-      cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
-      selectionChanged: false, // Whether the selection needs to be redrawn
-      updateMaxLine: false,    // Set when the widest line needs to be determined anew
-      scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
-      scrollToPos: null,       // Used to scroll to a specific position
-      focus: false,
-      id: ++nextOpId           // Unique ID
-    };
-    if (operationGroup) {
-      operationGroup.ops.push(cm.curOp);
-    } else {
-      cm.curOp.ownsGroup = operationGroup = {
-        ops: [cm.curOp],
-        delayedCallbacks: []
-      };
-    }
-  }
-
-  function fireCallbacksForOps(group) {
-    // Calls delayed callbacks and cursorActivity handlers until no
-    // new ones appear
-    var callbacks = group.delayedCallbacks, i = 0;
-    do {
-      for (; i < callbacks.length; i++)
-        callbacks[i].call(null);
-      for (var j = 0; j < group.ops.length; j++) {
-        var op = group.ops[j];
-        if (op.cursorActivityHandlers)
-          while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
-            op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm);
-      }
-    } while (i < callbacks.length);
-  }
-
-  // Finish an operation, updating the display and signalling delayed events
-  function endOperation(cm) {
-    var op = cm.curOp, group = op.ownsGroup;
-    if (!group) return;
-
-    try { fireCallbacksForOps(group); }
-    finally {
-      operationGroup = null;
-      for (var i = 0; i < group.ops.length; i++)
-        group.ops[i].cm.curOp = null;
-      endOperations(group);
-    }
-  }
-
-  // The DOM updates done when an operation finishes are batched so
-  // that the minimum number of relayouts are required.
-  function endOperations(group) {
-    var ops = group.ops;
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_R1(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
-      endOperation_W1(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_R2(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
-      endOperation_W2(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_finish(ops[i]);
-  }
-
-  function endOperation_R1(op) {
-    var cm = op.cm, display = cm.display;
-    maybeClipScrollbars(cm);
-    if (op.updateMaxLine) findMaxLine(cm);
-
-    op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
-      op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
-                         op.scrollToPos.to.line >= display.viewTo) ||
-      display.maxLineChanged && cm.options.lineWrapping;
-    op.update = op.mustUpdate &&
-      new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
-  }
-
-  function endOperation_W1(op) {
-    op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
-  }
-
-  function endOperation_R2(op) {
-    var cm = op.cm, display = cm.display;
-    if (op.updatedDisplay) updateHeightsInViewport(cm);
-
-    op.barMeasure = measureForScrollbars(cm);
-
-    // If the max line changed since it was last measured, measure it,
-    // and ensure the document's width matches it.
-    // updateDisplay_W2 will use these properties to do the actual resizing
-    if (display.maxLineChanged && !cm.options.lineWrapping) {
-      op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
-      cm.display.sizerWidth = op.adjustWidthTo;
-      op.barMeasure.scrollWidth =
-        Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
-      op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
-    }
-
-    if (op.updatedDisplay || op.selectionChanged)
-      op.preparedSelection = display.input.prepareSelection(op.focus);
-  }
-
-  function endOperation_W2(op) {
-    var cm = op.cm;
-
-    if (op.adjustWidthTo != null) {
-      cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
-      if (op.maxScrollLeft < cm.doc.scrollLeft)
-        setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true);
-      cm.display.maxLineChanged = false;
-    }
-
-    var takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
-    if (op.preparedSelection)
-      cm.display.input.showSelection(op.preparedSelection, takeFocus);
-    if (op.updatedDisplay || op.startHeight != cm.doc.height)
-      updateScrollbars(cm, op.barMeasure);
-    if (op.updatedDisplay)
-      setDocumentHeight(cm, op.barMeasure);
-
-    if (op.selectionChanged) restartBlink(cm);
-
-    if (cm.state.focused && op.updateInput)
-      cm.display.input.reset(op.typing);
-    if (takeFocus) ensureFocus(op.cm);
-  }
-
-  function endOperation_finish(op) {
-    var cm = op.cm, display = cm.display, doc = cm.doc;
-
-    if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
-
-    // Abort mouse wheel delta measurement, when scrolling explicitly
-    if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
-      display.wheelStartX = display.wheelStartY = null;
-
-    // Propagate the scroll position to the actual DOM scroller
-    if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
-      doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
-      display.scrollbars.setScrollTop(doc.scrollTop);
-      display.scroller.scrollTop = doc.scrollTop;
-    }
-    if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-      doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
-      display.scrollbars.setScrollLeft(doc.scrollLeft);
-      display.scroller.scrollLeft = doc.scrollLeft;
-      alignHorizontally(cm);
-    }
-    // If we need to scroll a specific position into view, do so.
-    if (op.scrollToPos) {
-      var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
-                                     clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
-      if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
-    }
-
-    // Fire events for markers that are hidden/unidden by editing or
-    // undoing
-    var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
-    if (hidden) for (var i = 0; i < hidden.length; ++i)
-      if (!hidden[i].lines.length) signal(hidden[i], "hide");
-    if (unhidden) for (var i = 0; i < unhidden.length; ++i)
-      if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
-
-    if (display.wrapper.offsetHeight)
-      doc.scrollTop = cm.display.scroller.scrollTop;
-
-    // Fire change events, and delayed event handlers
-    if (op.changeObjs)
-      signal(cm, "changes", cm, op.changeObjs);
-    if (op.update)
-      op.update.finish();
-  }
-
-  // Run the given function in an operation
-  function runInOp(cm, f) {
-    if (cm.curOp) return f();
-    startOperation(cm);
-    try { return f(); }
-    finally { endOperation(cm); }
-  }
-  // Wraps a function in an operation. Returns the wrapped function.
-  function operation(cm, f) {
-    return function() {
-      if (cm.curOp) return f.apply(cm, arguments);
-      startOperation(cm);
-      try { return f.apply(cm, arguments); }
-      finally { endOperation(cm); }
-    };
-  }
-  // Used to add methods to editor and doc instances, wrapping them in
-  // operations.
-  function methodOp(f) {
-    return function() {
-      if (this.curOp) return f.apply(this, arguments);
-      startOperation(this);
-      try { return f.apply(this, arguments); }
-      finally { endOperation(this); }
-    };
-  }
-  function docMethodOp(f) {
-    return function() {
-      var cm = this.cm;
-      if (!cm || cm.curOp) return f.apply(this, arguments);
-      startOperation(cm);
-      try { return f.apply(this, arguments); }
-      finally { endOperation(cm); }
-    };
-  }
-
-  // VIEW TRACKING
-
-  // These objects are used to represent the visible (currently drawn)
-  // part of the document. A LineView may correspond to multiple
-  // logical lines, if those are connected by collapsed ranges.
-  function LineView(doc, line, lineN) {
-    // The starting line
-    this.line = line;
-    // Continuing lines, if any
-    this.rest = visualLineContinued(line);
-    // Number of logical lines in this visual line
-    this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
-    this.node = this.text = null;
-    this.hidden = lineIsHidden(doc, line);
-  }
-
-  // Create a range of LineView objects for the given lines.
-  function buildViewArray(cm, from, to) {
-    var array = [], nextPos;
-    for (var pos = from; pos < to; pos = nextPos) {
-      var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
-      nextPos = pos + view.size;
-      array.push(view);
-    }
-    return array;
-  }
-
-  // Updates the display.view data structure for a given change to the
-  // document. From and to are in pre-change coordinates. Lendiff is
-  // the amount of lines added or subtracted by the change. This is
-  // used for changes that span multiple lines, or change the way
-  // lines are divided into visual lines. regLineChange (below)
-  // registers single-line changes.
-  function regChange(cm, from, to, lendiff) {
-    if (from == null) from = cm.doc.first;
-    if (to == null) to = cm.doc.first + cm.doc.size;
-    if (!lendiff) lendiff = 0;
-
-    var display = cm.display;
-    if (lendiff && to < display.viewTo &&
-        (display.updateLineNumbers == null || display.updateLineNumbers > from))
-      display.updateLineNumbers = from;
-
-    cm.curOp.viewChanged = true;
-
-    if (from >= display.viewTo) { // Change after
-      if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
-        resetView(cm);
-    } else if (to <= display.viewFrom) { // Change before
-      if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
-        resetView(cm);
-      } else {
-        display.viewFrom += lendiff;
-        display.viewTo += lendiff;
-      }
-    } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
-      resetView(cm);
-    } else if (from <= display.viewFrom) { // Top overlap
-      var cut = viewCuttingPoint(cm, to, to + lendiff, 1);
-      if (cut) {
-        display.view = display.view.slice(cut.index);
-        display.viewFrom = cut.lineN;
-        display.viewTo += lendiff;
-      } else {
-        resetView(cm);
-      }
-    } else if (to >= display.viewTo) { // Bottom overlap
-      var cut = viewCuttingPoint(cm, from, from, -1);
-      if (cut) {
-        display.view = display.view.slice(0, cut.index);
-        display.viewTo = cut.lineN;
-      } else {
-        resetView(cm);
-      }
-    } else { // Gap in the middle
-      var cutTop = viewCuttingPoint(cm, from, from, -1);
-      var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);
-      if (cutTop && cutBot) {
-        display.view = display.view.slice(0, cutTop.index)
-          .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
-          .concat(display.view.slice(cutBot.index));
-        display.viewTo += lendiff;
-      } else {
-        resetView(cm);
-      }
-    }
-
-    var ext = display.externalMeasured;
-    if (ext) {
-      if (to < ext.lineN)
-        ext.lineN += lendiff;
-      else if (from < ext.lineN + ext.size)
-        display.externalMeasured = null;
-    }
-  }
-
-  // Register a change to a single line. Type must be one of "text",
-  // "gutter", "class", "widget"
-  function regLineChange(cm, line, type) {
-    cm.curOp.viewChanged = true;
-    var display = cm.display, ext = cm.display.externalMeasured;
-    if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
-      display.externalMeasured = null;
-
-    if (line < display.viewFrom || line >= display.viewTo) return;
-    var lineView = display.view[findViewIndex(cm, line)];
-    if (lineView.node == null) return;
-    var arr = lineView.changes || (lineView.changes = []);
-    if (indexOf(arr, type) == -1) arr.push(type);
-  }
-
-  // Clear the view.
-  function resetView(cm) {
-    cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
-    cm.display.view = [];
-    cm.display.viewOffset = 0;
-  }
-
-  // Find the view element corresponding to a given line. Return null
-  // when the line isn't visible.
-  function findViewIndex(cm, n) {
-    if (n >= cm.display.viewTo) return null;
-    n -= cm.display.viewFrom;
-    if (n < 0) return null;
-    var view = cm.display.view;
-    for (var i = 0; i < view.length; i++) {
-      n -= view[i].size;
-      if (n < 0) return i;
-    }
-  }
-
-  function viewCuttingPoint(cm, oldN, newN, dir) {
-    var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
-    if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
-      return {index: index, lineN: newN};
-    for (var i = 0, n = cm.display.viewFrom; i < index; i++)
-      n += view[i].size;
-    if (n != oldN) {
-      if (dir > 0) {
-        if (index == view.length - 1) return null;
-        diff = (n + view[index].size) - oldN;
-        index++;
-      } else {
-        diff = n - oldN;
-      }
-      oldN += diff; newN += diff;
-    }
-    while (visualLineNo(cm.doc, newN) != newN) {
-      if (index == (dir < 0 ? 0 : view.length - 1)) return null;
-      newN += dir * view[index - (dir < 0 ? 1 : 0)].size;
-      index += dir;
-    }
-    return {index: index, lineN: newN};
-  }
-
-  // Force the view to cover a given range, adding empty view element
-  // or clipping off existing ones as needed.
-  function adjustView(cm, from, to) {
-    var display = cm.display, view = display.view;
-    if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
-      display.view = buildViewArray(cm, from, to);
-      display.viewFrom = from;
-    } else {
-      if (display.viewFrom > from)
-        display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view);
-      else if (display.viewFrom < from)
-        display.view = display.view.slice(findViewIndex(cm, from));
-      display.viewFrom = from;
-      if (display.viewTo < to)
-        display.view = display.view.concat(buildViewArray(cm, display.viewTo, to));
-      else if (display.viewTo > to)
-        display.view = display.view.slice(0, findViewIndex(cm, to));
-    }
-    display.viewTo = to;
-  }
-
-  // Count the number of lines in the view whose DOM representation is
-  // out of date (or nonexistent).
-  function countDirtyView(cm) {
-    var view = cm.display.view, dirty = 0;
-    for (var i = 0; i < view.length; i++) {
-      var lineView = view[i];
-      if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty;
-    }
-    return dirty;
-  }
-
-  // EVENT HANDLERS
-
-  // Attach the necessary event handlers when initializing the editor
-  function registerEventHandlers(cm) {
-    var d = cm.display;
-    on(d.scroller, "mousedown", operation(cm, onMouseDown));
-    // Older IE's will not fire a second mousedown for a double click
-    if (ie && ie_version < 11)
-      on(d.scroller, "dblclick", operation(cm, function(e) {
-        if (signalDOMEvent(cm, e)) return;
-        var pos = posFromMouse(cm, e);
-        if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
-        e_preventDefault(e);
-        var word = cm.findWordAt(pos);
-        extendSelection(cm.doc, word.anchor, word.head);
-      }));
-    else
-      on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
-    // Some browsers fire contextmenu *after* opening the menu, at
-    // which point we can't mess with it anymore. Context menu is
-    // handled in onMouseDown for these browsers.
-    if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
-
-    // Used to suppress mouse event handling when a touch happens
-    var touchFinished, prevTouch = {end: 0};
-    function finishTouch() {
-      if (d.activeTouch) {
-        touchFinished = setTimeout(function() {d.activeTouch = null;}, 1000);
-        prevTouch = d.activeTouch;
-        prevTouch.end = +new Date;
-      }
-    };
-    function isMouseLikeTouchEvent(e) {
-      if (e.touches.length != 1) return false;
-      var touch = e.touches[0];
-      return touch.radiusX <= 1 && touch.radiusY <= 1;
-    }
-    function farAway(touch, other) {
-      if (other.left == null) return true;
-      var dx = other.left - touch.left, dy = other.top - touch.top;
-      return dx * dx + dy * dy > 20 * 20;
-    }
-    on(d.scroller, "touchstart", function(e) {
-      if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
-        clearTimeout(touchFinished);
-        var now = +new Date;
-        d.activeTouch = {start: now, moved: false,
-                         prev: now - prevTouch.end <= 300 ? prevTouch : null};
-        if (e.touches.length == 1) {
-          d.activeTouch.left = e.touches[0].pageX;
-          d.activeTouch.top = e.touches[0].pageY;
-        }
-      }
-    });
-    on(d.scroller, "touchmove", function() {
-      if (d.activeTouch) d.activeTouch.moved = true;
-    });
-    on(d.scroller, "touchend", function(e) {
-      var touch = d.activeTouch;
-      if (touch && !eventInWidget(d, e) && touch.left != null &&
-          !touch.moved && new Date - touch.start < 300) {
-        var pos = cm.coordsChar(d.activeTouch, "page"), range;
-        if (!touch.prev || farAway(touch, touch.prev)) // Single tap
-          range = new Range(pos, pos);
-        else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
-          range = cm.findWordAt(pos);
-        else // Triple tap
-          range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)));
-        cm.setSelection(range.anchor, range.head);
-        cm.focus();
-        e_preventDefault(e);
-      }
-      finishTouch();
-    });
-    on(d.scroller, "touchcancel", finishTouch);
-
-    // Sync scrolling between fake scrollbars and real scrollable
-    // area, ensure viewport is updated when scrolling.
-    on(d.scroller, "scroll", function() {
-      if (d.scroller.clientHeight) {
-        setScrollTop(cm, d.scroller.scrollTop);
-        setScrollLeft(cm, d.scroller.scrollLeft, true);
-        signal(cm, "scroll", cm);
-      }
-    });
-
-    // Listen to wheel events in order to try and update the viewport on time.
-    on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
-    on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
-
-    // Prevent wrapper from ever scrolling
-    on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
-
-    d.dragFunctions = {
-      enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
-      over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
-      start: function(e){onDragStart(cm, e);},
-      drop: operation(cm, onDrop),
-      leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }}
-    };
-
-    var inp = d.input.getField();
-    on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
-    on(inp, "keydown", operation(cm, onKeyDown));
-    on(inp, "keypress", operation(cm, onKeyPress));
-    on(inp, "focus", bind(onFocus, cm));
-    on(inp, "blur", bind(onBlur, cm));
-  }
-
-  function dragDropChanged(cm, value, old) {
-    var wasOn = old && old != CodeMirror.Init;
-    if (!value != !wasOn) {
-      var funcs = cm.display.dragFunctions;
-      var toggle = value ? on : off;
-      toggle(cm.display.scroller, "dragstart", funcs.start);
-      toggle(cm.display.scroller, "dragenter", funcs.enter);
-      toggle(cm.display.scroller, "dragover", funcs.over);
-      toggle(cm.display.scroller, "dragleave", funcs.leave);
-      toggle(cm.display.scroller, "drop", funcs.drop);
-    }
-  }
-
-  // Called when the window resizes
-  function onResize(cm) {
-    var d = cm.display;
-    if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
-      return;
-    // Might be a text scaling operation, clear size caches.
-    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
-    d.scrollbarsClipped = false;
-    cm.setSize();
-  }
-
-  // MOUSE EVENTS
-
-  // Return true when the given mouse event happened in a widget
-  function eventInWidget(display, e) {
-    for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
-      if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
-          (n.parentNode == display.sizer && n != display.mover))
-        return true;
-    }
-  }
-
-  // Given a mouse event, find the corresponding position. If liberal
-  // is false, it checks whether a gutter or scrollbar was clicked,
-  // and returns null if it was. forRect is used by rectangular
-  // selections, and tries to estimate a character position even for
-  // coordinates beyond the right of the text.
-  function posFromMouse(cm, e, liberal, forRect) {
-    var display = cm.display;
-    if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null;
-
-    var x, y, space = display.lineSpace.getBoundingClientRect();
-    // Fails unpredictably on IE[67] when mouse is dragged around quickly.
-    try { x = e.clientX - space.left; y = e.clientY - space.top; }
-    catch (e) { return null; }
-    var coords = coordsChar(cm, x, y), line;
-    if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
-      var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
-      coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
-    }
-    return coords;
-  }
-
-  // A mouse down can be a single click, double click, triple click,
-  // start of selection drag, start of text drag, new cursor
-  // (ctrl-click), rectangle drag (alt-drag), or xwin
-  // middle-click-paste. Or it might be a click on something we should
-  // not interfere with, such as a scrollbar or widget.
-  function onMouseDown(e) {
-    var cm = this, display = cm.display;
-    if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return;
-    display.shift = e.shiftKey;
-
-    if (eventInWidget(display, e)) {
-      if (!webkit) {
-        // Briefly turn off draggability, to allow widgets to do
-        // normal dragging things.
-        display.scroller.draggable = false;
-        setTimeout(function(){display.scroller.draggable = true;}, 100);
-      }
-      return;
-    }
-    if (clickInGutter(cm, e)) return;
-    var start = posFromMouse(cm, e);
-    window.focus();
-
-    switch (e_button(e)) {
-    case 1:
-      // #3261: make sure, that we're not starting a second selection
-      if (cm.state.selectingText)
-        cm.state.selectingText(e);
-      else if (start)
-        leftButtonDown(cm, e, start);
-      else if (e_target(e) == display.scroller)
-        e_preventDefault(e);
-      break;
-    case 2:
-      if (webkit) cm.state.lastMiddleDown = +new Date;
-      if (start) extendSelection(cm.doc, start);
-      setTimeout(function() {display.input.focus();}, 20);
-      e_preventDefault(e);
-      break;
-    case 3:
-      if (captureRightClick) onContextMenu(cm, e);
-      else delayBlurEvent(cm);
-      break;
-    }
-  }
-
-  var lastClick, lastDoubleClick;
-  function leftButtonDown(cm, e, start) {
-    if (ie) setTimeout(bind(ensureFocus, cm), 0);
-    else cm.curOp.focus = activeElt();
-
-    var now = +new Date, type;
-    if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
-      type = "triple";
-    } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
-      type = "double";
-      lastDoubleClick = {time: now, pos: start};
-    } else {
-      type = "single";
-      lastClick = {time: now, pos: start};
-    }
-
-    var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
-    if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
-        type == "single" && (contained = sel.contains(start)) > -1 &&
-        (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
-        (cmp(contained.to(), start) > 0 || start.xRel < 0))
-      leftButtonStartDrag(cm, e, start, modifier);
-    else
-      leftButtonSelect(cm, e, start, type, modifier);
-  }
-
-  // Start a text drag. When it ends, see if any dragging actually
-  // happen, and treat as a click if it didn't.
-  function leftButtonStartDrag(cm, e, start, modifier) {
-    var display = cm.display, startTime = +new Date;
-    var dragEnd = operation(cm, function(e2) {
-      if (webkit) display.scroller.draggable = false;
-      cm.state.draggingText = false;
-      off(document, "mouseup", dragEnd);
-      off(display.scroller, "drop", dragEnd);
-      if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
-        e_preventDefault(e2);
-        if (!modifier && +new Date - 200 < startTime)
-          extendSelection(cm.doc, start);
-        // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
-        if (webkit || ie && ie_version == 9)
-          setTimeout(function() {document.body.focus(); display.input.focus();}, 20);
-        else
-          display.input.focus();
-      }
-    });
-    // Let the drag handler handle this.
-    if (webkit) display.scroller.draggable = true;
-    cm.state.draggingText = dragEnd;
-    dragEnd.copy = mac ? e.altKey : e.ctrlKey
-    // IE's approach to draggable
-    if (display.scroller.dragDrop) display.scroller.dragDrop();
-    on(document, "mouseup", dragEnd);
-    on(display.scroller, "drop", dragEnd);
-  }
-
-  // Normal selection, as opposed to text dragging.
-  function leftButtonSelect(cm, e, start, type, addNew) {
-    var display = cm.display, doc = cm.doc;
-    e_preventDefault(e);
-
-    var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
-    if (addNew && !e.shiftKey) {
-      ourIndex = doc.sel.contains(start);
-      if (ourIndex > -1)
-        ourRange = ranges[ourIndex];
-      else
-        ourRange = new Range(start, start);
-    } else {
-      ourRange = doc.sel.primary();
-      ourIndex = doc.sel.primIndex;
-    }
-
-    if (chromeOS ? e.shiftKey && e.metaKey : e.altKey) {
-      type = "rect";
-      if (!addNew) ourRange = new Range(start, start);
-      start = posFromMouse(cm, e, true, true);
-      ourIndex = -1;
-    } else if (type == "double") {
-      var word = cm.findWordAt(start);
-      if (cm.display.shift || doc.extend)
-        ourRange = extendRange(doc, ourRange, word.anchor, word.head);
-      else
-        ourRange = word;
-    } else if (type == "triple") {
-      var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)));
-      if (cm.display.shift || doc.extend)
-        ourRange = extendRange(doc, ourRange, line.anchor, line.head);
-      else
-        ourRange = line;
-    } else {
-      ourRange = extendRange(doc, ourRange, start);
-    }
-
-    if (!addNew) {
-      ourIndex = 0;
-      setSelection(doc, new Selection([ourRange], 0), sel_mouse);
-      startSel = doc.sel;
-    } else if (ourIndex == -1) {
-      ourIndex = ranges.length;
-      setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
-                   {scroll: false, origin: "*mouse"});
-    } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
-      setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
-                   {scroll: false, origin: "*mouse"});
-      startSel = doc.sel;
-    } else {
-      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
-    }
-
-    var lastPos = start;
-    function extendTo(pos) {
-      if (cmp(lastPos, pos) == 0) return;
-      lastPos = pos;
-
-      if (type == "rect") {
-        var ranges = [], tabSize = cm.options.tabSize;
-        var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
-        var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
-        var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);
-        for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
-             line <= end; line++) {
-          var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
-          if (left == right)
-            ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)));
-          else if (text.length > leftPos)
-            ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
-        }
-        if (!ranges.length) ranges.push(new Range(start, start));
-        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
-                     {origin: "*mouse", scroll: false});
-        cm.scrollIntoView(pos);
-      } else {
-        var oldRange = ourRange;
-        var anchor = oldRange.anchor, head = pos;
-        if (type != "single") {
-          if (type == "double")
-            var range = cm.findWordAt(pos);
-          else
-            var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
-          if (cmp(range.anchor, anchor) > 0) {
-            head = range.head;
-            anchor = minPos(oldRange.from(), range.anchor);
-          } else {
-            head = range.anchor;
-            anchor = maxPos(oldRange.to(), range.head);
-          }
-        }
-        var ranges = startSel.ranges.slice(0);
-        ranges[ourIndex] = new Range(clipPos(doc, anchor), head);
-        setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse);
-      }
-    }
-
-    var editorSize = display.wrapper.getBoundingClientRect();
-    // Used to ensure timeout re-tries don't fire when another extend
-    // happened in the meantime (clearTimeout isn't reliable -- at
-    // least on Chrome, the timeouts still happen even when cleared,
-    // if the clear happens after their scheduled firing time).
-    var counter = 0;
-
-    function extend(e) {
-      var curCount = ++counter;
-      var cur = posFromMouse(cm, e, true, type == "rect");
-      if (!cur) return;
-      if (cmp(cur, lastPos) != 0) {
-        cm.curOp.focus = activeElt();
-        extendTo(cur);
-        var visible = visibleLines(display, doc);
-        if (cur.line >= visible.to || cur.line < visible.from)
-          setTimeout(operation(cm, function(){if (counter == curCount) extend(e);}), 150);
-      } else {
-        var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0;
-        if (outside) setTimeout(operation(cm, function() {
-          if (counter != curCount) return;
-          display.scroller.scrollTop += outside;
-          extend(e);
-        }), 50);
-      }
-    }
-
-    function done(e) {
-      cm.state.selectingText = false;
-      counter = Infinity;
-      e_preventDefault(e);
-      display.input.focus();
-      off(document, "mousemove", move);
-      off(document, "mouseup", up);
-      doc.history.lastSelOrigin = null;
-    }
-
-    var move = operation(cm, function(e) {
-      if (!e_button(e)) done(e);
-      else extend(e);
-    });
-    var up = operation(cm, done);
-    cm.state.selectingText = up;
-    on(document, "mousemove", move);
-    on(document, "mouseup", up);
-  }
-
-  // Determines whether an event happened in the gutter, and fires the
-  // handlers for the corresponding event.
-  function gutterEvent(cm, e, type, prevent) {
-    try { var mX = e.clientX, mY = e.clientY; }
-    catch(e) { return false; }
-    if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
-    if (prevent) e_preventDefault(e);
-
-    var display = cm.display;
-    var lineBox = display.lineDiv.getBoundingClientRect();
-
-    if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e);
-    mY -= lineBox.top - display.viewOffset;
-
-    for (var i = 0; i < cm.options.gutters.length; ++i) {
-      var g = display.gutters.childNodes[i];
-      if (g && g.getBoundingClientRect().right >= mX) {
-        var line = lineAtHeight(cm.doc, mY);
-        var gutter = cm.options.gutters[i];
-        signal(cm, type, cm, line, gutter, e);
-        return e_defaultPrevented(e);
-      }
-    }
-  }
-
-  function clickInGutter(cm, e) {
-    return gutterEvent(cm, e, "gutterClick", true);
-  }
-
-  // Kludge to work around strange IE behavior where it'll sometimes
-  // re-fire a series of drag-related events right after the drop (#1551)
-  var lastDrop = 0;
-
-  function onDrop(e) {
-    var cm = this;
-    clearDragCursor(cm);
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
-      return;
-    e_preventDefault(e);
-    if (ie) lastDrop = +new Date;
-    var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
-    if (!pos || cm.isReadOnly()) return;
-    // Might be a file drop, in which case we simply extract the text
-    // and insert it.
-    if (files && files.length && window.FileReader && window.File) {
-      var n = files.length, text = Array(n), read = 0;
-      var loadFile = function(file, i) {
-        if (cm.options.allowDropFileTypes &&
-            indexOf(cm.options.allowDropFileTypes, file.type) == -1)
-          return;
-
-        var reader = new FileReader;
-        reader.onload = operation(cm, function() {
-          var content = reader.result;
-          if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = "";
-          text[i] = content;
-          if (++read == n) {
-            pos = clipPos(cm.doc, pos);
-            var change = {from: pos, to: pos,
-                          text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
-                          origin: "paste"};
-            makeChange(cm.doc, change);
-            setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
-          }
-        });
-        reader.readAsText(file);
-      };
-      for (var i = 0; i < n; ++i) loadFile(files[i], i);
-    } else { // Normal drop
-      // Don't do a replace if the drop happened inside of the selected text.
-      if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
-        cm.state.draggingText(e);
-        // Ensure the editor is re-focused
-        setTimeout(function() {cm.display.input.focus();}, 20);
-        return;
-      }
-      try {
-        var text = e.dataTransfer.getData("Text");
-        if (text) {
-          if (cm.state.draggingText && !cm.state.draggingText.copy)
-            var selected = cm.listSelections();
-          setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
-          if (selected) for (var i = 0; i < selected.length; ++i)
-            replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
-          cm.replaceSelection(text, "around", "paste");
-          cm.display.input.focus();
-        }
-      }
-      catch(e){}
-    }
-  }
-
-  function onDragStart(cm, e) {
-    if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
-
-    e.dataTransfer.setData("Text", cm.getSelection());
-    e.dataTransfer.effectAllowed = "copyMove"
-
-    // Use dummy image instead of default browsers image.
-    // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
-    if (e.dataTransfer.setDragImage && !safari) {
-      var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
-      img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
-      if (presto) {
-        img.width = img.height = 1;
-        cm.display.wrapper.appendChild(img);
-        // Force a relayout, or Opera won't use our image for some obscure reason
-        img._top = img.offsetTop;
-      }
-      e.dataTransfer.setDragImage(img, 0, 0);
-      if (presto) img.parentNode.removeChild(img);
-    }
-  }
-
-  function onDragOver(cm, e) {
-    var pos = posFromMouse(cm, e);
-    if (!pos) return;
-    var frag = document.createDocumentFragment();
-    drawSelectionCursor(cm, pos, frag);
-    if (!cm.display.dragCursor) {
-      cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
-      cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
-    }
-    removeChildrenAndAdd(cm.display.dragCursor, frag);
-  }
-
-  function clearDragCursor(cm) {
-    if (cm.display.dragCursor) {
-      cm.display.lineSpace.removeChild(cm.display.dragCursor);
-      cm.display.dragCursor = null;
-    }
-  }
-
-  // SCROLL EVENTS
-
-  // Sync the scrollable area and scrollbars, ensure the viewport
-  // covers the visible area.
-  function setScrollTop(cm, val) {
-    if (Math.abs(cm.doc.scrollTop - val) < 2) return;
-    cm.doc.scrollTop = val;
-    if (!gecko) updateDisplaySimple(cm, {top: val});
-    if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
-    cm.display.scrollbars.setScrollTop(val);
-    if (gecko) updateDisplaySimple(cm);
-    startWorker(cm, 100);
-  }
-  // Sync scroller and scrollbar, ensure the gutter elements are
-  // aligned.
-  function setScrollLeft(cm, val, isScroller) {
-    if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return;
-    val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
-    cm.doc.scrollLeft = val;
-    alignHorizontally(cm);
-    if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val;
-    cm.display.scrollbars.setScrollLeft(val);
-  }
-
-  // Since the delta values reported on mouse wheel events are
-  // unstandardized between browsers and even browser versions, and
-  // generally horribly unpredictable, this code starts by measuring
-  // the scroll effect that the first few mouse wheel events have,
-  // and, from that, detects the way it can convert deltas to pixel
-  // offsets afterwards.
-  //
-  // The reason we want to know the amount a wheel event will scroll
-  // is that it gives us a chance to update the display before the
-  // actual scrolling happens, reducing flickering.
-
-  var wheelSamples = 0, wheelPixelsPerUnit = null;
-  // Fill in a browser-detected starting value on browsers where we
-  // know one. These don't have to be accurate -- the result of them
-  // being wrong would just be a slight flicker on the first wheel
-  // scroll (if it is large enough).
-  if (ie) wheelPixelsPerUnit = -.53;
-  else if (gecko) wheelPixelsPerUnit = 15;
-  else if (chrome) wheelPixelsPerUnit = -.7;
-  else if (safari) wheelPixelsPerUnit = -1/3;
-
-  var wheelEventDelta = function(e) {
-    var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
-    if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail;
-    if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;
-    else if (dy == null) dy = e.wheelDelta;
-    return {x: dx, y: dy};
-  };
-  CodeMirror.wheelEventPixels = function(e) {
-    var delta = wheelEventDelta(e);
-    delta.x *= wheelPixelsPerUnit;
-    delta.y *= wheelPixelsPerUnit;
-    return delta;
-  };
-
-  function onScrollWheel(cm, e) {
-    var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
-
-    var display = cm.display, scroll = display.scroller;
-    // Quit if there's nothing to scroll here
-    var canScrollX = scroll.scrollWidth > scroll.clientWidth;
-    var canScrollY = scroll.scrollHeight > scroll.clientHeight;
-    if (!(dx && canScrollX || dy && canScrollY)) return;
-
-    // Webkit browsers on OS X abort momentum scrolls when the target
-    // of the scroll event is removed from the scrollable element.
-    // This hack (see related code in patchDisplay) makes sure the
-    // element is kept around.
-    if (dy && mac && webkit) {
-      outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
-        for (var i = 0; i < view.length; i++) {
-          if (view[i].node == cur) {
-            cm.display.currentWheelTarget = cur;
-            break outer;
-          }
-        }
-      }
-    }
-
-    // On some browsers, horizontal scrolling will cause redraws to
-    // happen before the gutter has been realigned, causing it to
-    // wriggle around in a most unseemly way. When we have an
-    // estimated pixels/delta value, we just handle horizontal
-    // scrolling entirely here. It'll be slightly off from native, but
-    // better than glitching out.
-    if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
-      if (dy && canScrollY)
-        setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
-      setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
-      // Only prevent default scrolling if vertical scrolling is
-      // actually possible. Otherwise, it causes vertical scroll
-      // jitter on OSX trackpads when deltaX is small and deltaY
-      // is large (issue #3579)
-      if (!dy || (dy && canScrollY))
-        e_preventDefault(e);
-      display.wheelStartX = null; // Abort measurement, if in progress
-      return;
-    }
-
-    // 'Project' the visible viewport to cover the area that is being
-    // scrolled into view (if we know enough to estimate it).
-    if (dy && wheelPixelsPerUnit != null) {
-      var pixels = dy * wheelPixelsPerUnit;
-      var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
-      if (pixels < 0) top = Math.max(0, top + pixels - 50);
-      else bot = Math.min(cm.doc.height, bot + pixels + 50);
-      updateDisplaySimple(cm, {top: top, bottom: bot});
-    }
-
-    if (wheelSamples < 20) {
-      if (display.wheelStartX == null) {
-        display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
-        display.wheelDX = dx; display.wheelDY = dy;
-        setTimeout(function() {
-          if (display.wheelStartX == null) return;
-          var movedX = scroll.scrollLeft - display.wheelStartX;
-          var movedY = scroll.scrollTop - display.wheelStartY;
-          var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
-            (movedX && display.wheelDX && movedX / display.wheelDX);
-          display.wheelStartX = display.wheelStartY = null;
-          if (!sample) return;
-          wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
-          ++wheelSamples;
-        }, 200);
-      } else {
-        display.wheelDX += dx; display.wheelDY += dy;
-      }
-    }
-  }
-
-  // KEY EVENTS
-
-  // Run a handler that was bound to a key.
-  function doHandleBinding(cm, bound, dropShift) {
-    if (typeof bound == "string") {
-      bound = commands[bound];
-      if (!bound) return false;
-    }
-    // Ensure previous input has been read, so that the handler sees a
-    // consistent view of the document
-    cm.display.input.ensurePolled();
-    var prevShift = cm.display.shift, done = false;
-    try {
-      if (cm.isReadOnly()) cm.state.suppressEdits = true;
-      if (dropShift) cm.display.shift = false;
-      done = bound(cm) != Pass;
-    } finally {
-      cm.display.shift = prevShift;
-      cm.state.suppressEdits = false;
-    }
-    return done;
-  }
-
-  function lookupKeyForEditor(cm, name, handle) {
-    for (var i = 0; i < cm.state.keyMaps.length; i++) {
-      var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
-      if (result) return result;
-    }
-    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
-      || lookupKey(name, cm.options.keyMap, handle, cm);
-  }
-
-  var stopSeq = new Delayed;
-  function dispatchKey(cm, name, e, handle) {
-    var seq = cm.state.keySeq;
-    if (seq) {
-      if (isModifierKey(name)) return "handled";
-      stopSeq.set(50, function() {
-        if (cm.state.keySeq == seq) {
-          cm.state.keySeq = null;
-          cm.display.input.reset();
-        }
-      });
-      name = seq + " " + name;
-    }
-    var result = lookupKeyForEditor(cm, name, handle);
-
-    if (result == "multi")
-      cm.state.keySeq = name;
-    if (result == "handled")
-      signalLater(cm, "keyHandled", cm, name, e);
-
-    if (result == "handled" || result == "multi") {
-      e_preventDefault(e);
-      restartBlink(cm);
-    }
-
-    if (seq && !result && /\'$/.test(name)) {
-      e_preventDefault(e);
-      return true;
-    }
-    return !!result;
-  }
-
-  // Handle a key from the keydown event.
-  function handleKeyBinding(cm, e) {
-    var name = keyName(e, true);
-    if (!name) return false;
-
-    if (e.shiftKey && !cm.state.keySeq) {
-      // First try to resolve full name (including 'Shift-'). Failing
-      // that, see if there is a cursor-motion command (starting with
-      // 'go') bound to the keyname without 'Shift-'.
-      return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);})
-          || dispatchKey(cm, name, e, function(b) {
-               if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
-                 return doHandleBinding(cm, b);
-             });
-    } else {
-      return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); });
-    }
-  }
-
-  // Handle a key from the keypress event
-  function handleCharBinding(cm, e, ch) {
-    return dispatchKey(cm, "'" + ch + "'", e,
-                       function(b) { return doHandleBinding(cm, b, true); });
-  }
-
-  var lastStoppedKey = null;
-  function onKeyDown(e) {
-    var cm = this;
-    cm.curOp.focus = activeElt();
-    if (signalDOMEvent(cm, e)) return;
-    // IE does strange things with escape.
-    if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false;
-    var code = e.keyCode;
-    cm.display.shift = code == 16 || e.shiftKey;
-    var handled = handleKeyBinding(cm, e);
-    if (presto) {
-      lastStoppedKey = handled ? code : null;
-      // Opera has no cut event... we try to at least catch the key combo
-      if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
-        cm.replaceSelection("", null, "cut");
-    }
-
-    // Turn mouse into crosshair when Alt is held on Mac.
-    if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
-      showCrossHair(cm);
-  }
-
-  function showCrossHair(cm) {
-    var lineDiv = cm.display.lineDiv;
-    addClass(lineDiv, "CodeMirror-crosshair");
-
-    function up(e) {
-      if (e.keyCode == 18 || !e.altKey) {
-        rmClass(lineDiv, "CodeMirror-crosshair");
-        off(document, "keyup", up);
-        off(document, "mouseover", up);
-      }
-    }
-    on(document, "keyup", up);
-    on(document, "mouseover", up);
-  }
-
-  function onKeyUp(e) {
-    if (e.keyCode == 16) this.doc.sel.shift = false;
-    signalDOMEvent(this, e);
-  }
-
-  function onKeyPress(e) {
-    var cm = this;
-    if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
-    var keyCode = e.keyCode, charCode = e.charCode;
-    if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
-    if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
-    var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
-    if (handleCharBinding(cm, e, ch)) return;
-    cm.display.input.onKeyPress(e);
-  }
-
-  // FOCUS/BLUR EVENTS
-
-  function delayBlurEvent(cm) {
-    cm.state.delayingBlurEvent = true;
-    setTimeout(function() {
-      if (cm.state.delayingBlurEvent) {
-        cm.state.delayingBlurEvent = false;
-        onBlur(cm);
-      }
-    }, 100);
-  }
-
-  function onFocus(cm) {
-    if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false;
-
-    if (cm.options.readOnly == "nocursor") return;
-    if (!cm.state.focused) {
-      signal(cm, "focus", cm);
-      cm.state.focused = true;
-      addClass(cm.display.wrapper, "CodeMirror-focused");
-      // This test prevents this from firing when a context
-      // menu is closed (since the input reset would kill the
-      // select-all detection hack)
-      if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
-        cm.display.input.reset();
-        if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
-      }
-      cm.display.input.receivedFocus();
-    }
-    restartBlink(cm);
-  }
-  function onBlur(cm) {
-    if (cm.state.delayingBlurEvent) return;
-
-    if (cm.state.focused) {
-      signal(cm, "blur", cm);
-      cm.state.focused = false;
-      rmClass(cm.display.wrapper, "CodeMirror-focused");
-    }
-    clearInterval(cm.display.blinker);
-    setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150);
-  }
-
-  // CONTEXT MENU HANDLING
-
-  // To make the context menu work, we need to briefly unhide the
-  // textarea (making it as unobtrusive as possible) to let the
-  // right-click take effect on it.
-  function onContextMenu(cm, e) {
-    if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
-    if (signalDOMEvent(cm, e, "contextmenu")) return;
-    cm.display.input.onContextMenu(e);
-  }
-
-  function contextMenuInGutter(cm, e) {
-    if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", false);
-  }
-
-  // UPDATING
-
-  // Compute the position of the end of a change (its 'to' property
-  // refers to the pre-change end).
-  var changeEnd = CodeMirror.changeEnd = function(change) {
-    if (!change.text) return change.to;
-    return Pos(change.from.line + change.text.length - 1,
-               lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));
-  };
-
-  // Adjust a position to refer to the post-change position of the
-  // same text, or the end of the change if the change covers it.
-  function adjustForChange(pos, change) {
-    if (cmp(pos, change.from) < 0) return pos;
-    if (cmp(pos, change.to) <= 0) return changeEnd(change);
-
-    var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
-    if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch;
-    return Pos(line, ch);
-  }
-
-  function computeSelAfterChange(doc, change) {
-    var out = [];
-    for (var i = 0; i < doc.sel.ranges.length; i++) {
-      var range = doc.sel.ranges[i];
-      out.push(new Range(adjustForChange(range.anchor, change),
-                         adjustForChange(range.head, change)));
-    }
-    return normalizeSelection(out, doc.sel.primIndex);
-  }
-
-  function offsetPos(pos, old, nw) {
-    if (pos.line == old.line)
-      return Pos(nw.line, pos.ch - old.ch + nw.ch);
-    else
-      return Pos(nw.line + (pos.line - old.line), pos.ch);
-  }
-
-  // Used by replaceSelections to allow moving the selection to the
-  // start or around the replaced test. Hint may be "start" or "around".
-  function computeReplacedSel(doc, changes, hint) {
-    var out = [];
-    var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
-    for (var i = 0; i < changes.length; i++) {
-      var change = changes[i];
-      var from = offsetPos(change.from, oldPrev, newPrev);
-      var to = offsetPos(changeEnd(change), oldPrev, newPrev);
-      oldPrev = change.to;
-      newPrev = to;
-      if (hint == "around") {
-        var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0;
-        out[i] = new Range(inv ? to : from, inv ? from : to);
-      } else {
-        out[i] = new Range(from, from);
-      }
-    }
-    return new Selection(out, doc.sel.primIndex);
-  }
-
-  // Allow "beforeChange" event handlers to influence a change
-  function filterChange(doc, change, update) {
-    var obj = {
-      canceled: false,
-      from: change.from,
-      to: change.to,
-      text: change.text,
-      origin: change.origin,
-      cancel: function() { this.canceled = true; }
-    };
-    if (update) obj.update = function(from, to, text, origin) {
-      if (from) this.from = clipPos(doc, from);
-      if (to) this.to = clipPos(doc, to);
-      if (text) this.text = text;
-      if (origin !== undefined) this.origin = origin;
-    };
-    signal(doc, "beforeChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj);
-
-    if (obj.canceled) return null;
-    return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin};
-  }
-
-  // Apply a change to a document, and add it to the document's
-  // history, and propagating it to all linked documents.
-  function makeChange(doc, change, ignoreReadOnly) {
-    if (doc.cm) {
-      if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly);
-      if (doc.cm.state.suppressEdits) return;
-    }
-
-    if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
-      change = filterChange(doc, change, true);
-      if (!change) return;
-    }
-
-    // Possibly split or suppress the update based on the presence
-    // of read-only spans in its range.
-    var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
-    if (split) {
-      for (var i = split.length - 1; i >= 0; --i)
-        makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text});
-    } else {
-      makeChangeInner(doc, change);
-    }
-  }
-
-  function makeChangeInner(doc, change) {
-    if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return;
-    var selAfter = computeSelAfterChange(doc, change);
-    addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
-
-    makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
-    var rebased = [];
-
-    linkedDocs(doc, function(doc, sharedHist) {
-      if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-        rebaseHist(doc.history, change);
-        rebased.push(doc.history);
-      }
-      makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change));
-    });
-  }
-
-  // Revert a change stored in a document's history.
-  function makeChangeFromHistory(doc, type, allowSelectionOnly) {
-    if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return;
-
-    var hist = doc.history, event, selAfter = doc.sel;
-    var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
-
-    // Verify that there is a useable event (so that ctrl-z won't
-    // needlessly clear selection events)
-    for (var i = 0; i < source.length; i++) {
-      event = source[i];
-      if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
-        break;
-    }
-    if (i == source.length) return;
-    hist.lastOrigin = hist.lastSelOrigin = null;
-
-    for (;;) {
-      event = source.pop();
-      if (event.ranges) {
-        pushSelectionToHistory(event, dest);
-        if (allowSelectionOnly && !event.equals(doc.sel)) {
-          setSelection(doc, event, {clearRedo: false});
-          return;
-        }
-        selAfter = event;
-      }
-      else break;
-    }
-
-    // Build up a reverse change object to add to the opposite history
-    // stack (redo when undoing, and vice versa).
-    var antiChanges = [];
-    pushSelectionToHistory(selAfter, dest);
-    dest.push({changes: antiChanges, generation: hist.generation});
-    hist.generation = event.generation || ++hist.maxGeneration;
-
-    var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
-
-    for (var i = event.changes.length - 1; i >= 0; --i) {
-      var change = event.changes[i];
-      change.origin = type;
-      if (filter && !filterChange(doc, change, false)) {
-        source.length = 0;
-        return;
-      }
-
-      antiChanges.push(historyChangeFromChange(doc, change));
-
-      var after = i ? computeSelAfterChange(doc, change) : lst(source);
-      makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
-      if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)});
-      var rebased = [];
-
-      // Propagate to the linked documents
-      linkedDocs(doc, function(doc, sharedHist) {
-        if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-          rebaseHist(doc.history, change);
-          rebased.push(doc.history);
-        }
-        makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change));
-      });
-    }
-  }
-
-  // Sub-views need their line numbers shifted when text is added
-  // above or below them in the parent document.
-  function shiftDoc(doc, distance) {
-    if (distance == 0) return;
-    doc.first += distance;
-    doc.sel = new Selection(map(doc.sel.ranges, function(range) {
-      return new Range(Pos(range.anchor.line + distance, range.anchor.ch),
-                       Pos(range.head.line + distance, range.head.ch));
-    }), doc.sel.primIndex);
-    if (doc.cm) {
-      regChange(doc.cm, doc.first, doc.first - distance, distance);
-      for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
-        regLineChange(doc.cm, l, "gutter");
-    }
-  }
-
-  // More lower-level change function, handling only a single document
-  // (not linked ones).
-  function makeChangeSingleDoc(doc, change, selAfter, spans) {
-    if (doc.cm && !doc.cm.curOp)
-      return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans);
-
-    if (change.to.line < doc.first) {
-      shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line));
-      return;
-    }
-    if (change.from.line > doc.lastLine()) return;
-
-    // Clip the change to the size of this doc
-    if (change.from.line < doc.first) {
-      var shift = change.text.length - 1 - (doc.first - change.from.line);
-      shiftDoc(doc, shift);
-      change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
-                text: [lst(change.text)], origin: change.origin};
-    }
-    var last = doc.lastLine();
-    if (change.to.line > last) {
-      change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
-                text: [change.text[0]], origin: change.origin};
-    }
-
-    change.removed = getBetween(doc, change.from, change.to);
-
-    if (!selAfter) selAfter = computeSelAfterChange(doc, change);
-    if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
-    else updateDoc(doc, change, spans);
-    setSelectionNoUndo(doc, selAfter, sel_dontScroll);
-  }
-
-  // Handle the interaction of a change to a document with the editor
-  // that this document is part of.
-  function makeChangeSingleDocInEditor(cm, change, spans) {
-    var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
-
-    var recomputeMaxLength = false, checkWidthStart = from.line;
-    if (!cm.options.lineWrapping) {
-      checkWidthStart = lineNo(visualLine(getLine(doc, from.line)));
-      doc.iter(checkWidthStart, to.line + 1, function(line) {
-        if (line == display.maxLine) {
-          recomputeMaxLength = true;
-          return true;
-        }
-      });
-    }
-
-    if (doc.sel.contains(change.from, change.to) > -1)
-      signalCursorActivity(cm);
-
-    updateDoc(doc, change, spans, estimateHeight(cm));
-
-    if (!cm.options.lineWrapping) {
-      doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
-        var len = lineLength(line);
-        if (len > display.maxLineLength) {
-          display.maxLine = line;
-          display.maxLineLength = len;
-          display.maxLineChanged = true;
-          recomputeMaxLength = false;
-        }
-      });
-      if (recomputeMaxLength) cm.curOp.updateMaxLine = true;
-    }
-
-    // Adjust frontier, schedule worker
-    doc.frontier = Math.min(doc.frontier, from.line);
-    startWorker(cm, 400);
-
-    var lendiff = change.text.length - (to.line - from.line) - 1;
-    // Remember that these lines changed, for updating the display
-    if (change.full)
-      regChange(cm);
-    else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
-      regLineChange(cm, from.line, "text");
-    else
-      regChange(cm, from.line, to.line + 1, lendiff);
-
-    var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change");
-    if (changeHandler || changesHandler) {
-      var obj = {
-        from: from, to: to,
-        text: change.text,
-        removed: change.removed,
-        origin: change.origin
-      };
-      if (changeHandler) signalLater(cm, "change", cm, obj);
-      if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj);
-    }
-    cm.display.selForContextMenu = null;
-  }
-
-  function replaceRange(doc, code, from, to, origin) {
-    if (!to) to = from;
-    if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
-    if (typeof code == "string") code = doc.splitLines(code);
-    makeChange(doc, {from: from, to: to, text: code, origin: origin});
-  }
-
-  // SCROLLING THINGS INTO VIEW
-
-  // If an editor sits on the top or bottom of the window, partially
-  // scrolled out of view, this ensures that the cursor is visible.
-  function maybeScrollWindow(cm, coords) {
-    if (signalDOMEvent(cm, "scrollCursorIntoView")) return;
-
-    var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
-    if (coords.top + box.top < 0) doScroll = true;
-    else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
-    if (doScroll != null && !phantom) {
-      var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
-                           (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
-                           (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
-                           coords.left + "px; width: 2px;");
-      cm.display.lineSpace.appendChild(scrollNode);
-      scrollNode.scrollIntoView(doScroll);
-      cm.display.lineSpace.removeChild(scrollNode);
-    }
-  }
-
-  // Scroll a given position into view (immediately), verifying that
-  // it actually became visible (as line heights are accurately
-  // measured, the position of something may 'drift' during drawing).
-  function scrollPosIntoView(cm, pos, end, margin) {
-    if (margin == null) margin = 0;
-    for (var limit = 0; limit < 5; limit++) {
-      var changed = false, coords = cursorCoords(cm, pos);
-      var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
-      var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
-                                         Math.min(coords.top, endCoords.top) - margin,
-                                         Math.max(coords.left, endCoords.left),
-                                         Math.max(coords.bottom, endCoords.bottom) + margin);
-      var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
-      if (scrollPos.scrollTop != null) {
-        setScrollTop(cm, scrollPos.scrollTop);
-        if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true;
-      }
-      if (scrollPos.scrollLeft != null) {
-        setScrollLeft(cm, scrollPos.scrollLeft);
-        if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true;
-      }
-      if (!changed) break;
-    }
-    return coords;
-  }
-
-  // Scroll a given set of coordinates into view (immediately).
-  function scrollIntoView(cm, x1, y1, x2, y2) {
-    var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2);
-    if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop);
-    if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft);
-  }
-
-  // Calculate a new scroll position needed to scroll the given
-  // rectangle into view. Returns an object with scrollTop and
-  // scrollLeft properties. When these are undefined, the
-  // vertical/horizontal position does not need to be adjusted.
-  function calculateScrollPos(cm, x1, y1, x2, y2) {
-    var display = cm.display, snapMargin = textHeight(cm.display);
-    if (y1 < 0) y1 = 0;
-    var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
-    var screen = displayHeight(cm), result = {};
-    if (y2 - y1 > screen) y2 = y1 + screen;
-    var docBottom = cm.doc.height + paddingVert(display);
-    var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
-    if (y1 < screentop) {
-      result.scrollTop = atTop ? 0 : y1;
-    } else if (y2 > screentop + screen) {
-      var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen);
-      if (newTop != screentop) result.scrollTop = newTop;
-    }
-
-    var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
-    var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
-    var tooWide = x2 - x1 > screenw;
-    if (tooWide) x2 = x1 + screenw;
-    if (x1 < 10)
-      result.scrollLeft = 0;
-    else if (x1 < screenleft)
-      result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));
-    else if (x2 > screenw + screenleft - 3)
-      result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw;
-    return result;
-  }
-
-  // Store a relative adjustment to the scroll position in the current
-  // operation (to be applied when the operation finishes).
-  function addToScrollPos(cm, left, top) {
-    if (left != null || top != null) resolveScrollToPos(cm);
-    if (left != null)
-      cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left;
-    if (top != null)
-      cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
-  }
-
-  // Make sure that at the end of the operation the current cursor is
-  // shown.
-  function ensureCursorVisible(cm) {
-    resolveScrollToPos(cm);
-    var cur = cm.getCursor(), from = cur, to = cur;
-    if (!cm.options.lineWrapping) {
-      from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur;
-      to = Pos(cur.line, cur.ch + 1);
-    }
-    cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true};
-  }
-
-  // When an operation has its scrollToPos property set, and another
-  // scroll action is applied before the end of the operation, this
-  // 'simulates' scrolling that position into view in a cheap way, so
-  // that the effect of intermediate scroll commands is not ignored.
-  function resolveScrollToPos(cm) {
-    var range = cm.curOp.scrollToPos;
-    if (range) {
-      cm.curOp.scrollToPos = null;
-      var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to);
-      var sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
-                                    Math.min(from.top, to.top) - range.margin,
-                                    Math.max(from.right, to.right),
-                                    Math.max(from.bottom, to.bottom) + range.margin);
-      cm.scrollTo(sPos.scrollLeft, sPos.scrollTop);
-    }
-  }
-
-  // API UTILITIES
-
-  // Indent the given line. The how parameter can be "smart",
-  // "add"/null, "subtract", or "prev". When aggressive is false
-  // (typically set to true for forced single-line indents), empty
-  // lines are not indented, and places where the mode returns Pass
-  // are left alone.
-  function indentLine(cm, n, how, aggressive) {
-    var doc = cm.doc, state;
-    if (how == null) how = "add";
-    if (how == "smart") {
-      // Fall back to "prev" when the mode doesn't have an indentation
-      // method.
-      if (!doc.mode.indent) how = "prev";
-      else state = getStateBefore(cm, n);
-    }
-
-    var tabSize = cm.options.tabSize;
-    var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
-    if (line.stateAfter) line.stateAfter = null;
-    var curSpaceString = line.text.match(/^\s*/)[0], indentation;
-    if (!aggressive && !/\S/.test(line.text)) {
-      indentation = 0;
-      how = "not";
-    } else if (how == "smart") {
-      indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
-      if (indentation == Pass || indentation > 150) {
-        if (!aggressive) return;
-        how = "prev";
-      }
-    }
-    if (how == "prev") {
-      if (n > doc.first) indentation = countColumn(getLine(doc, n-1).text, null, tabSize);
-      else indentation = 0;
-    } else if (how == "add") {
-      indentation = curSpace + cm.options.indentUnit;
-    } else if (how == "subtract") {
-      indentation = curSpace - cm.options.indentUnit;
-    } else if (typeof how == "number") {
-      indentation = curSpace + how;
-    }
-    indentation = Math.max(0, indentation);
-
-    var indentString = "", pos = 0;
-    if (cm.options.indentWithTabs)
-      for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
-    if (pos < indentation) indentString += spaceStr(indentation - pos);
-
-    if (indentString != curSpaceString) {
-      replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
-      line.stateAfter = null;
-      return true;
-    } else {
-      // Ensure that, if the cursor was in the whitespace at the start
-      // of the line, it is moved to the end of that space.
-      for (var i = 0; i < doc.sel.ranges.length; i++) {
-        var range = doc.sel.ranges[i];
-        if (range.head.line == n && range.head.ch < curSpaceString.length) {
-          var pos = Pos(n, curSpaceString.length);
-          replaceOneSelection(doc, i, new Range(pos, pos));
-          break;
-        }
-      }
-    }
-  }
-
-  // Utility for applying a change to a line by handle or number,
-  // returning the number and optionally registering the line as
-  // changed.
-  function changeLine(doc, handle, changeType, op) {
-    var no = handle, line = handle;
-    if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
-    else no = lineNo(handle);
-    if (no == null) return null;
-    if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType);
-    return line;
-  }
-
-  // Helper for deleting text near the selection(s), used to implement
-  // backspace, delete, and similar functionality.
-  function deleteNearSelection(cm, compute) {
-    var ranges = cm.doc.sel.ranges, kill = [];
-    // Build up a set of ranges to kill first, merging overlapping
-    // ranges.
-    for (var i = 0; i < ranges.length; i++) {
-      var toKill = compute(ranges[i]);
-      while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
-        var replaced = kill.pop();
-        if (cmp(replaced.from, toKill.from) < 0) {
-          toKill.from = replaced.from;
-          break;
-        }
-      }
-      kill.push(toKill);
-    }
-    // Next, remove those actual ranges.
-    runInOp(cm, function() {
-      for (var i = kill.length - 1; i >= 0; i--)
-        replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete");
-      ensureCursorVisible(cm);
-    });
-  }
-
-  // Used for horizontal relative motion. Dir is -1 or 1 (left or
-  // right), unit can be "char", "column" (like char, but doesn't
-  // cross line boundaries), "word" (across next word), or "group" (to
-  // the start of next group of word or non-word-non-whitespace
-  // chars). The visually param controls whether, in right-to-left
-  // text, direction 1 means to move towards the next index in the
-  // string, or towards the character to the right of the current
-  // position. The resulting position will have a hitSide=true
-  // property if it reached the end of the document.
-  function findPosH(doc, pos, dir, unit, visually) {
-    var line = pos.line, ch = pos.ch, origDir = dir;
-    var lineObj = getLine(doc, line);
-    function findNextLine() {
-      var l = line + dir;
-      if (l < doc.first || l >= doc.first + doc.size) return false
-      line = l;
-      return lineObj = getLine(doc, l);
-    }
-    function moveOnce(boundToLine) {
-      var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true);
-      if (next == null) {
-        if (!boundToLine && findNextLine()) {
-          if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
-          else ch = dir < 0 ? lineObj.text.length : 0;
-        } else return false
-      } else ch = next;
-      return true;
-    }
-
-    if (unit == "char") {
-      moveOnce()
-    } else if (unit == "column") {
-      moveOnce(true)
-    } else if (unit == "word" || unit == "group") {
-      var sawType = null, group = unit == "group";
-      var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
-      for (var first = true;; first = false) {
-        if (dir < 0 && !moveOnce(!first)) break;
-        var cur = lineObj.text.charAt(ch) || "\n";
-        var type = isWordChar(cur, helper) ? "w"
-          : group && cur == "\n" ? "n"
-          : !group || /\s/.test(cur) ? null
-          : "p";
-        if (group && !first && !type) type = "s";
-        if (sawType && sawType != type) {
-          if (dir < 0) {dir = 1; moveOnce();}
-          break;
-        }
-
-        if (type) sawType = type;
-        if (dir > 0 && !moveOnce(!first)) break;
-      }
-    }
-    var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true);
-    if (!cmp(pos, result)) result.hitSide = true;
-    return result;
-  }
-
-  // For relative vertical movement. Dir may be -1 or 1. Unit can be
-  // "page" or "line". The resulting position will have a hitSide=true
-  // property if it reached the end of the document.
-  function findPosV(cm, pos, dir, unit) {
-    var doc = cm.doc, x = pos.left, y;
-    if (unit == "page") {
-      var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
-      y = pos.top + dir * (pageSize - (dir < 0 ? 1.5 : .5) * textHeight(cm.display));
-    } else if (unit == "line") {
-      y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
-    }
-    for (;;) {
-      var target = coordsChar(cm, x, y);
-      if (!target.outside) break;
-      if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; }
-      y += dir * 5;
-    }
-    return target;
-  }
-
-  // EDITOR METHODS
-
-  // The publicly visible API. Note that methodOp(f) means
-  // 'wrap f in an operation, performed on its `this` parameter'.
-
-  // This is not the complete set of editor methods. Most of the
-  // methods defined on the Doc type are also injected into
-  // CodeMirror.prototype, for backwards compatibility and
-  // convenience.
-
-  CodeMirror.prototype = {
-    constructor: CodeMirror,
-    focus: function(){window.focus(); this.display.input.focus();},
-
-    setOption: function(option, value) {
-      var options = this.options, old = options[option];
-      if (options[option] == value && option != "mode") return;
-      options[option] = value;
-      if (optionHandlers.hasOwnProperty(option))
-        operation(this, optionHandlers[option])(this, value, old);
-    },
-
-    getOption: function(option) {return this.options[option];},
-    getDoc: function() {return this.doc;},
-
-    addKeyMap: function(map, bottom) {
-      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
-    },
-    removeKeyMap: function(map) {
-      var maps = this.state.keyMaps;
-      for (var i = 0; i < maps.length; ++i)
-        if (maps[i] == map || maps[i].name == map) {
-          maps.splice(i, 1);
-          return true;
-        }
-    },
-
-    addOverlay: methodOp(function(spec, options) {
-      var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
-      if (mode.startState) throw new Error("Overlays may not be stateful.");
-      this.state.overlays.push({mode: mode, modeSpec: spec, opaque: options && options.opaque});
-      this.state.modeGen++;
-      regChange(this);
-    }),
-    removeOverlay: methodOp(function(spec) {
-      var overlays = this.state.overlays;
-      for (var i = 0; i < overlays.length; ++i) {
-        var cur = overlays[i].modeSpec;
-        if (cur == spec || typeof spec == "string" && cur.name == spec) {
-          overlays.splice(i, 1);
-          this.state.modeGen++;
-          regChange(this);
-          return;
-        }
-      }
-    }),
-
-    indentLine: methodOp(function(n, dir, aggressive) {
-      if (typeof dir != "string" && typeof dir != "number") {
-        if (dir == null) dir = this.options.smartIndent ? "smart" : "prev";
-        else dir = dir ? "add" : "subtract";
-      }
-      if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive);
-    }),
-    indentSelection: methodOp(function(how) {
-      var ranges = this.doc.sel.ranges, end = -1;
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
-        if (!range.empty()) {
-          var from = range.from(), to = range.to();
-          var start = Math.max(end, from.line);
-          end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
-          for (var j = start; j < end; ++j)
-            indentLine(this, j, how);
-          var newRanges = this.doc.sel.ranges;
-          if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
-            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll);
-        } else if (range.head.line > end) {
-          indentLine(this, range.head.line, how, true);
-          end = range.head.line;
-          if (i == this.doc.sel.primIndex) ensureCursorVisible(this);
-        }
-      }
-    }),
-
-    // Fetch the parser token for a given character. Useful for hacks
-    // that want to inspect the mode state (say, for completion).
-    getTokenAt: function(pos, precise) {
-      return takeToken(this, pos, precise);
-    },
-
-    getLineTokens: function(line, precise) {
-      return takeToken(this, Pos(line), precise, true);
-    },
-
-    getTokenTypeAt: function(pos) {
-      pos = clipPos(this.doc, pos);
-      var styles = getLineStyles(this, getLine(this.doc, pos.line));
-      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
-      var type;
-      if (ch == 0) type = styles[2];
-      else for (;;) {
-        var mid = (before + after) >> 1;
-        if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;
-        else if (styles[mid * 2 + 1] < ch) before = mid + 1;
-        else { type = styles[mid * 2 + 2]; break; }
-      }
-      var cut = type ? type.indexOf("cm-overlay ") : -1;
-      return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1);
-    },
-
-    getModeAt: function(pos) {
-      var mode = this.doc.mode;
-      if (!mode.innerMode) return mode;
-      return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode;
-    },
-
-    getHelper: function(pos, type) {
-      return this.getHelpers(pos, type)[0];
-    },
-
-    getHelpers: function(pos, type) {
-      var found = [];
-      if (!helpers.hasOwnProperty(type)) return found;
-      var help = helpers[type], mode = this.getModeAt(pos);
-      if (typeof mode[type] == "string") {
-        if (help[mode[type]]) found.push(help[mode[type]]);
-      } else if (mode[type]) {
-        for (var i = 0; i < mode[type].length; i++) {
-          var val = help[mode[type][i]];
-          if (val) found.push(val);
-        }
-      } else if (mode.helperType && help[mode.helperType]) {
-        found.push(help[mode.helperType]);
-      } else if (help[mode.name]) {
-        found.push(help[mode.name]);
-      }
-      for (var i = 0; i < help._global.length; i++) {
-        var cur = help._global[i];
-        if (cur.pred(mode, this) && indexOf(found, cur.val) == -1)
-          found.push(cur.val);
-      }
-      return found;
-    },
-
-    getStateAfter: function(line, precise) {
-      var doc = this.doc;
-      line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
-      return getStateBefore(this, line + 1, precise);
-    },
-
-    cursorCoords: function(start, mode) {
-      var pos, range = this.doc.sel.primary();
-      if (start == null) pos = range.head;
-      else if (typeof start == "object") pos = clipPos(this.doc, start);
-      else pos = start ? range.from() : range.to();
-      return cursorCoords(this, pos, mode || "page");
-    },
-
-    charCoords: function(pos, mode) {
-      return charCoords(this, clipPos(this.doc, pos), mode || "page");
-    },
-
-    coordsChar: function(coords, mode) {
-      coords = fromCoordSystem(this, coords, mode || "page");
-      return coordsChar(this, coords.left, coords.top);
-    },
-
-    lineAtHeight: function(height, mode) {
-      height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
-      return lineAtHeight(this.doc, height + this.display.viewOffset);
-    },
-    heightAtLine: function(line, mode) {
-      var end = false, lineObj;
-      if (typeof line == "number") {
-        var last = this.doc.first + this.doc.size - 1;
-        if (line < this.doc.first) line = this.doc.first;
-        else if (line > last) { line = last; end = true; }
-        lineObj = getLine(this.doc, line);
-      } else {
-        lineObj = line;
-      }
-      return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top +
-        (end ? this.doc.height - heightAtLine(lineObj) : 0);
-    },
-
-    defaultTextHeight: function() { return textHeight(this.display); },
-    defaultCharWidth: function() { return charWidth(this.display); },
-
-    setGutterMarker: methodOp(function(line, gutterID, value) {
-      return changeLine(this.doc, line, "gutter", function(line) {
-        var markers = line.gutterMarkers || (line.gutterMarkers = {});
-        markers[gutterID] = value;
-        if (!value && isEmpty(markers)) line.gutterMarkers = null;
-        return true;
-      });
-    }),
-
-    clearGutter: methodOp(function(gutterID) {
-      var cm = this, doc = cm.doc, i = doc.first;
-      doc.iter(function(line) {
-        if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
-          line.gutterMarkers[gutterID] = null;
-          regLineChange(cm, i, "gutter");
-          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null;
-        }
-        ++i;
-      });
-    }),
-
-    lineInfo: function(line) {
-      if (typeof line == "number") {
-        if (!isLine(this.doc, line)) return null;
-        var n = line;
-        line = getLine(this.doc, line);
-        if (!line) return null;
-      } else {
-        var n = lineNo(line);
-        if (n == null) return null;
-      }
-      return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
-              textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
-              widgets: line.widgets};
-    },
-
-    getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo};},
-
-    addWidget: function(pos, node, scroll, vert, horiz) {
-      var display = this.display;
-      pos = cursorCoords(this, clipPos(this.doc, pos));
-      var top = pos.bottom, left = pos.left;
-      node.style.position = "absolute";
-      node.setAttribute("cm-ignore-events", "true");
-      this.display.input.setUneditable(node);
-      display.sizer.appendChild(node);
-      if (vert == "over") {
-        top = pos.top;
-      } else if (vert == "above" || vert == "near") {
-        var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
-        hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth);
-        // Default to positioning above (if specified and possible); otherwise default to positioning below
-        if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
-          top = pos.top - node.offsetHeight;
-        else if (pos.bottom + node.offsetHeight <= vspace)
-          top = pos.bottom;
-        if (left + node.offsetWidth > hspace)
-          left = hspace - node.offsetWidth;
-      }
-      node.style.top = top + "px";
-      node.style.left = node.style.right = "";
-      if (horiz == "right") {
-        left = display.sizer.clientWidth - node.offsetWidth;
-        node.style.right = "0px";
-      } else {
-        if (horiz == "left") left = 0;
-        else if (horiz == "middle") left = (display.sizer.clientWidth - node.offsetWidth) / 2;
-        node.style.left = left + "px";
-      }
-      if (scroll)
-        scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight);
-    },
-
-    triggerOnKeyDown: methodOp(onKeyDown),
-    triggerOnKeyPress: methodOp(onKeyPress),
-    triggerOnKeyUp: onKeyUp,
-
-    execCommand: function(cmd) {
-      if (commands.hasOwnProperty(cmd))
-        return commands[cmd].call(null, this);
-    },
-
-    triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
-
-    findPosH: function(from, amount, unit, visually) {
-      var dir = 1;
-      if (amount < 0) { dir = -1; amount = -amount; }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        cur = findPosH(this.doc, cur, dir, unit, visually);
-        if (cur.hitSide) break;
-      }
-      return cur;
-    },
-
-    moveH: methodOp(function(dir, unit) {
-      var cm = this;
-      cm.extendSelectionsBy(function(range) {
-        if (cm.display.shift || cm.doc.extend || range.empty())
-          return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually);
-        else
-          return dir < 0 ? range.from() : range.to();
-      }, sel_move);
-    }),
-
-    deleteH: methodOp(function(dir, unit) {
-      var sel = this.doc.sel, doc = this.doc;
-      if (sel.somethingSelected())
-        doc.replaceSelection("", null, "+delete");
-      else
-        deleteNearSelection(this, function(range) {
-          var other = findPosH(doc, range.head, dir, unit, false);
-          return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other};
-        });
-    }),
-
-    findPosV: function(from, amount, unit, goalColumn) {
-      var dir = 1, x = goalColumn;
-      if (amount < 0) { dir = -1; amount = -amount; }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        var coords = cursorCoords(this, cur, "div");
-        if (x == null) x = coords.left;
-        else coords.left = x;
-        cur = findPosV(this, coords, dir, unit);
-        if (cur.hitSide) break;
-      }
-      return cur;
-    },
-
-    moveV: methodOp(function(dir, unit) {
-      var cm = this, doc = this.doc, goals = [];
-      var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected();
-      doc.extendSelectionsBy(function(range) {
-        if (collapse)
-          return dir < 0 ? range.from() : range.to();
-        var headPos = cursorCoords(cm, range.head, "div");
-        if (range.goalColumn != null) headPos.left = range.goalColumn;
-        goals.push(headPos.left);
-        var pos = findPosV(cm, headPos, dir, unit);
-        if (unit == "page" && range == doc.sel.primary())
-          addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top);
-        return pos;
-      }, sel_move);
-      if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
-        doc.sel.ranges[i].goalColumn = goals[i];
-    }),
-
-    // Find the word at the given position (as returned by coordsChar).
-    findWordAt: function(pos) {
-      var doc = this.doc, line = getLine(doc, pos.line).text;
-      var start = pos.ch, end = pos.ch;
-      if (line) {
-        var helper = this.getHelper(pos, "wordChars");
-        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
-        var startChar = line.charAt(start);
-        var check = isWordChar(startChar, helper)
-          ? function(ch) { return isWordChar(ch, helper); }
-          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
-          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
-        while (start > 0 && check(line.charAt(start - 1))) --start;
-        while (end < line.length && check(line.charAt(end))) ++end;
-      }
-      return new Range(Pos(pos.line, start), Pos(pos.line, end));
-    },
-
-    toggleOverwrite: function(value) {
-      if (value != null && value == this.state.overwrite) return;
-      if (this.state.overwrite = !this.state.overwrite)
-        addClass(this.display.cursorDiv, "CodeMirror-overwrite");
-      else
-        rmClass(this.display.cursorDiv, "CodeMirror-overwrite");
-
-      signal(this, "overwriteToggle", this, this.state.overwrite);
-    },
-    hasFocus: function() { return this.display.input.getField() == activeElt(); },
-    isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit); },
-
-    scrollTo: methodOp(function(x, y) {
-      if (x != null || y != null) resolveScrollToPos(this);
-      if (x != null) this.curOp.scrollLeft = x;
-      if (y != null) this.curOp.scrollTop = y;
-    }),
-    getScrollInfo: function() {
-      var scroller = this.display.scroller;
-      return {left: scroller.scrollLeft, top: scroller.scrollTop,
-              height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
-              width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
-              clientHeight: displayHeight(this), clientWidth: displayWidth(this)};
-    },
-
-    scrollIntoView: methodOp(function(range, margin) {
-      if (range == null) {
-        range = {from: this.doc.sel.primary().head, to: null};
-        if (margin == null) margin = this.options.cursorScrollMargin;
-      } else if (typeof range == "number") {
-        range = {from: Pos(range, 0), to: null};
-      } else if (range.from == null) {
-        range = {from: range, to: null};
-      }
-      if (!range.to) range.to = range.from;
-      range.margin = margin || 0;
-
-      if (range.from.line != null) {
-        resolveScrollToPos(this);
-        this.curOp.scrollToPos = range;
-      } else {
-        var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
-                                      Math.min(range.from.top, range.to.top) - range.margin,
-                                      Math.max(range.from.right, range.to.right),
-                                      Math.max(range.from.bottom, range.to.bottom) + range.margin);
-        this.scrollTo(sPos.scrollLeft, sPos.scrollTop);
-      }
-    }),
-
-    setSize: methodOp(function(width, height) {
-      var cm = this;
-      function interpret(val) {
-        return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
-      }
-      if (width != null) cm.display.wrapper.style.width = interpret(width);
-      if (height != null) cm.display.wrapper.style.height = interpret(height);
-      if (cm.options.lineWrapping) clearLineMeasurementCache(this);
-      var lineNo = cm.display.viewFrom;
-      cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
-        if (line.widgets) for (var i = 0; i < line.widgets.length; i++)
-          if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; }
-        ++lineNo;
-      });
-      cm.curOp.forceUpdate = true;
-      signal(cm, "refresh", this);
-    }),
-
-    operation: function(f){return runInOp(this, f);},
-
-    refresh: methodOp(function() {
-      var oldHeight = this.display.cachedTextHeight;
-      regChange(this);
-      this.curOp.forceUpdate = true;
-      clearCaches(this);
-      this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
-      updateGutterSpace(this);
-      if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
-        estimateLineHeights(this);
-      signal(this, "refresh", this);
-    }),
-
-    swapDoc: methodOp(function(doc) {
-      var old = this.doc;
-      old.cm = null;
-      attachDoc(this, doc);
-      clearCaches(this);
-      this.display.input.reset();
-      this.scrollTo(doc.scrollLeft, doc.scrollTop);
-      this.curOp.forceScroll = true;
-      signalLater(this, "swapDoc", this, old);
-      return old;
-    }),
-
-    getInputField: function(){return this.display.input.getField();},
-    getWrapperElement: function(){return this.display.wrapper;},
-    getScrollerElement: function(){return this.display.scroller;},
-    getGutterElement: function(){return this.display.gutters;}
-  };
-  eventMixin(CodeMirror);
-
-  // OPTION DEFAULTS
-
-  // The default configuration options.
-  var defaults = CodeMirror.defaults = {};
-  // Functions to run when options are changed.
-  var optionHandlers = CodeMirror.optionHandlers = {};
-
-  function option(name, deflt, handle, notOnInit) {
-    CodeMirror.defaults[name] = deflt;
-    if (handle) optionHandlers[name] =
-      notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old);} : handle;
-  }
-
-  // Passed to option handlers when there is no old value.
-  var Init = CodeMirror.Init = {toString: function(){return "CodeMirror.Init";}};
-
-  // These two are, on init, called from the constructor because they
-  // have to be initialized before the editor can start at all.
-  option("value", "", function(cm, val) {
-    cm.setValue(val);
-  }, true);
-  option("mode", null, function(cm, val) {
-    cm.doc.modeOption = val;
-    loadMode(cm);
-  }, true);
-
-  option("indentUnit", 2, loadMode, true);
-  option("indentWithTabs", false);
-  option("smartIndent", true);
-  option("tabSize", 4, function(cm) {
-    resetModeState(cm);
-    clearCaches(cm);
-    regChange(cm);
-  }, true);
-  option("lineSeparator", null, function(cm, val) {
-    cm.doc.lineSep = val;
-    if (!val) return;
-    var newBreaks = [], lineNo = cm.doc.first;
-    cm.doc.iter(function(line) {
-      for (var pos = 0;;) {
-        var found = line.text.indexOf(val, pos);
-        if (found == -1) break;
-        pos = found + val.length;
-        newBreaks.push(Pos(lineNo, found));
-      }
-      lineNo++;
-    });
-    for (var i = newBreaks.length - 1; i >= 0; i--)
-      replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
-  });
-  option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
-    cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
-    if (old != CodeMirror.Init) cm.refresh();
-  });
-  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
-  option("electricChars", true);
-  option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
-    throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME
-  }, true);
-  option("rtlMoveVisually", !windows);
-  option("wholeLineUpdateBefore", true);
-
-  option("theme", "default", function(cm) {
-    themeChanged(cm);
-    guttersChanged(cm);
-  }, true);
-  option("keyMap", "default", function(cm, val, old) {
-    var next = getKeyMap(val);
-    var prev = old != CodeMirror.Init && getKeyMap(old);
-    if (prev && prev.detach) prev.detach(cm, next);
-    if (next.attach) next.attach(cm, prev || null);
-  });
-  option("extraKeys", null);
-
-  option("lineWrapping", false, wrappingChanged, true);
-  option("gutters", [], function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("fixedGutter", true, function(cm, val) {
-    cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
-    cm.refresh();
-  }, true);
-  option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm);}, true);
-  option("scrollbarStyle", "native", function(cm) {
-    initScrollbars(cm);
-    updateScrollbars(cm);
-    cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
-    cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
-  }, true);
-  option("lineNumbers", false, function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("firstLineNumber", 1, guttersChanged, true);
-  option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true);
-  option("showCursorWhenSelecting", false, updateSelection, true);
-
-  option("resetSelectionOnContextMenu", true);
-  option("lineWiseCopyCut", true);
-
-  option("readOnly", false, function(cm, val) {
-    if (val == "nocursor") {
-      onBlur(cm);
-      cm.display.input.blur();
-      cm.display.disabled = true;
-    } else {
-      cm.display.disabled = false;
-    }
-    cm.display.input.readOnlyChanged(val)
-  });
-  option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
-  option("dragDrop", true, dragDropChanged);
-  option("allowDropFileTypes", null);
-
-  option("cursorBlinkRate", 530);
-  option("cursorScrollMargin", 0);
-  option("cursorHeight", 1, updateSelection, true);
-  option("singleCursorHeightPerLine", true, updateSelection, true);
-  option("workTime", 100);
-  option("workDelay", 100);
-  option("flattenSpans", true, resetModeState, true);
-  option("addModeClass", false, resetModeState, true);
-  option("pollInterval", 100);
-  option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;});
-  option("historyEventDelay", 1250);
-  option("viewportMargin", 10, function(cm){cm.refresh();}, true);
-  option("maxHighlightLength", 10000, resetModeState, true);
-  option("moveInputWithCursor", true, function(cm, val) {
-    if (!val) cm.display.input.resetPosition();
-  });
-
-  option("tabindex", null, function(cm, val) {
-    cm.display.input.getField().tabIndex = val || "";
-  });
-  option("autofocus", null);
-
-  // MODE DEFINITION AND QUERYING
-
-  // Known modes, by name and by MIME
-  var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-
-  // Extra arguments are stored as the mode's dependencies, which is
-  // used by (legacy) mechanisms like loadmode.js to automatically
-  // load a mode. (Preferred mechanism is the require/define calls.)
-  CodeMirror.defineMode = function(name, mode) {
-    if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
-    if (arguments.length > 2)
-      mode.dependencies = Array.prototype.slice.call(arguments, 2);
-    modes[name] = mode;
-  };
-
-  CodeMirror.defineMIME = function(mime, spec) {
-    mimeModes[mime] = spec;
-  };
-
-  // Given a MIME type, a {name, ...options} config object, or a name
-  // string, return a mode config object.
-  CodeMirror.resolveMode = function(spec) {
-    if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
-      spec = mimeModes[spec];
-    } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-      var found = mimeModes[spec.name];
-      if (typeof found == "string") found = {name: found};
-      spec = createObj(found, spec);
-      spec.name = found.name;
-    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
-      return CodeMirror.resolveMode("application/xml");
-    }
-    if (typeof spec == "string") return {name: spec};
-    else return spec || {name: "null"};
-  };
-
-  // Given a mode spec (anything that resolveMode accepts), find and
-  // initialize an actual mode object.
-  CodeMirror.getMode = function(options, spec) {
-    var spec = CodeMirror.resolveMode(spec);
-    var mfactory = modes[spec.name];
-    if (!mfactory) return CodeMirror.getMode(options, "text/plain");
-    var modeObj = mfactory(options, spec);
-    if (modeExtensions.hasOwnProperty(spec.name)) {
-      var exts = modeExtensions[spec.name];
-      for (var prop in exts) {
-        if (!exts.hasOwnProperty(prop)) continue;
-        if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
-        modeObj[prop] = exts[prop];
-      }
-    }
-    modeObj.name = spec.name;
-    if (spec.helperType) modeObj.helperType = spec.helperType;
-    if (spec.modeProps) for (var prop in spec.modeProps)
-      modeObj[prop] = spec.modeProps[prop];
-
-    return modeObj;
-  };
-
-  // Minimal default mode.
-  CodeMirror.defineMode("null", function() {
-    return {token: function(stream) {stream.skipToEnd();}};
-  });
-  CodeMirror.defineMIME("text/plain", "null");
-
-  // This can be used to attach properties to mode objects from
-  // outside the actual mode definition.
-  var modeExtensions = CodeMirror.modeExtensions = {};
-  CodeMirror.extendMode = function(mode, properties) {
-    var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
-    copyObj(properties, exts);
-  };
-
-  // EXTENSIONS
-
-  CodeMirror.defineExtension = function(name, func) {
-    CodeMirror.prototype[name] = func;
-  };
-  CodeMirror.defineDocExtension = function(name, func) {
-    Doc.prototype[name] = func;
-  };
-  CodeMirror.defineOption = option;
-
-  var initHooks = [];
-  CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
-
-  var helpers = CodeMirror.helpers = {};
-  CodeMirror.registerHelper = function(type, name, value) {
-    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []};
-    helpers[type][name] = value;
-  };
-  CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
-    CodeMirror.registerHelper(type, name, value);
-    helpers[type]._global.push({pred: predicate, val: value});
-  };
-
-  // MODE STATE HANDLING
-
-  // Utility functions for working with state. Exported because nested
-  // modes need to do this for their inner modes.
-
-  var copyState = CodeMirror.copyState = function(mode, state) {
-    if (state === true) return state;
-    if (mode.copyState) return mode.copyState(state);
-    var nstate = {};
-    for (var n in state) {
-      var val = state[n];
-      if (val instanceof Array) val = val.concat([]);
-      nstate[n] = val;
-    }
-    return nstate;
-  };
-
-  var startState = CodeMirror.startState = function(mode, a1, a2) {
-    return mode.startState ? mode.startState(a1, a2) : true;
-  };
-
-  // Given a mode and a state (for that mode), find the inner mode and
-  // state at the position that the state refers to.
-  CodeMirror.innerMode = function(mode, state) {
-    while (mode.innerMode) {
-      var info = mode.innerMode(state);
-      if (!info || info.mode == mode) break;
-      state = info.state;
-      mode = info.mode;
-    }
-    return info || {mode: mode, state: state};
-  };
-
-  // STANDARD COMMANDS
-
-  // Commands are parameter-less actions that can be performed on an
-  // editor, mostly used for keybindings.
-  var commands = CodeMirror.commands = {
-    selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);},
-    singleSelection: function(cm) {
-      cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll);
-    },
-    killLine: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        if (range.empty()) {
-          var len = getLine(cm.doc, range.head.line).text.length;
-          if (range.head.ch == len && range.head.line < cm.lastLine())
-            return {from: range.head, to: Pos(range.head.line + 1, 0)};
-          else
-            return {from: range.head, to: Pos(range.head.line, len)};
-        } else {
-          return {from: range.from(), to: range.to()};
-        }
-      });
-    },
-    deleteLine: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        return {from: Pos(range.from().line, 0),
-                to: clipPos(cm.doc, Pos(range.to().line + 1, 0))};
-      });
-    },
-    delLineLeft: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        return {from: Pos(range.from().line, 0), to: range.from()};
-      });
-    },
-    delWrappedLineLeft: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var leftPos = cm.coordsChar({left: 0, top: top}, "div");
-        return {from: leftPos, to: range.from()};
-      });
-    },
-    delWrappedLineRight: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-        return {from: range.from(), to: rightPos };
-      });
-    },
-    undo: function(cm) {cm.undo();},
-    redo: function(cm) {cm.redo();},
-    undoSelection: function(cm) {cm.undoSelection();},
-    redoSelection: function(cm) {cm.redoSelection();},
-    goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
-    goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
-    goLineStart: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); },
-                            {origin: "+move", bias: 1});
-    },
-    goLineStartSmart: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        return lineStartSmart(cm, range.head);
-      }, {origin: "+move", bias: 1});
-    },
-    goLineEnd: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); },
-                            {origin: "+move", bias: -1});
-    },
-    goLineRight: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-      }, sel_move);
-    },
-    goLineLeft: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        return cm.coordsChar({left: 0, top: top}, "div");
-      }, sel_move);
-    },
-    goLineLeftSmart: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var pos = cm.coordsChar({left: 0, top: top}, "div");
-        if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head);
-        return pos;
-      }, sel_move);
-    },
-    goLineUp: function(cm) {cm.moveV(-1, "line");},
-    goLineDown: function(cm) {cm.moveV(1, "line");},
-    goPageUp: function(cm) {cm.moveV(-1, "page");},
-    goPageDown: function(cm) {cm.moveV(1, "page");},
-    goCharLeft: function(cm) {cm.moveH(-1, "char");},
-    goCharRight: function(cm) {cm.moveH(1, "char");},
-    goColumnLeft: function(cm) {cm.moveH(-1, "column");},
-    goColumnRight: function(cm) {cm.moveH(1, "column");},
-    goWordLeft: function(cm) {cm.moveH(-1, "word");},
-    goGroupRight: function(cm) {cm.moveH(1, "group");},
-    goGroupLeft: function(cm) {cm.moveH(-1, "group");},
-    goWordRight: function(cm) {cm.moveH(1, "word");},
-    delCharBefore: function(cm) {cm.deleteH(-1, "char");},
-    delCharAfter: function(cm) {cm.deleteH(1, "char");},
-    delWordBefore: function(cm) {cm.deleteH(-1, "word");},
-    delWordAfter: function(cm) {cm.deleteH(1, "word");},
-    delGroupBefore: function(cm) {cm.deleteH(-1, "group");},
-    delGroupAfter: function(cm) {cm.deleteH(1, "group");},
-    indentAuto: function(cm) {cm.indentSelection("smart");},
-    indentMore: function(cm) {cm.indentSelection("add");},
-    indentLess: function(cm) {cm.indentSelection("subtract");},
-    insertTab: function(cm) {cm.replaceSelection("\t");},
-    insertSoftTab: function(cm) {
-      var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize;
-      for (var i = 0; i < ranges.length; i++) {
-        var pos = ranges[i].from();
-        var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
-        spaces.push(spaceStr(tabSize - col % tabSize));
-      }
-      cm.replaceSelections(spaces);
-    },
-    defaultTab: function(cm) {
-      if (cm.somethingSelected()) cm.indentSelection("add");
-      else cm.execCommand("insertTab");
-    },
-    transposeChars: function(cm) {
-      runInOp(cm, function() {
-        var ranges = cm.listSelections(), newSel = [];
-        for (var i = 0; i < ranges.length; i++) {
-          var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
-          if (line) {
-            if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1);
-            if (cur.ch > 0) {
-              cur = new Pos(cur.line, cur.ch + 1);
-              cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
-                              Pos(cur.line, cur.ch - 2), cur, "+transpose");
-            } else if (cur.line > cm.doc.first) {
-              var prev = getLine(cm.doc, cur.line - 1).text;
-              if (prev)
-                cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
-                                prev.charAt(prev.length - 1),
-                                Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
-            }
-          }
-          newSel.push(new Range(cur, cur));
-        }
-        cm.setSelections(newSel);
-      });
-    },
-    newlineAndIndent: function(cm) {
-      runInOp(cm, function() {
-        var len = cm.listSelections().length;
-        for (var i = 0; i < len; i++) {
-          var range = cm.listSelections()[i];
-          cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input");
-          cm.indentLine(range.from().line + 1, null, true);
-        }
-        ensureCursorVisible(cm);
-      });
-    },
-    openLine: function(cm) {cm.replaceSelection("\n", "start")},
-    toggleOverwrite: function(cm) {cm.toggleOverwrite();}
-  };
-
-
-  // STANDARD KEYMAPS
-
-  var keyMap = CodeMirror.keyMap = {};
-
-  keyMap.basic = {
-    "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
-    "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
-    "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
-    "Tab": "defaultTab", "Shift-Tab": "indentAuto",
-    "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
-    "Esc": "singleSelection"
-  };
-  // Note that the save and find-related commands aren't defined by
-  // default. User code or addons can define them. Unknown commands
-  // are simply ignored.
-  keyMap.pcDefault = {
-    "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
-    "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
-    "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
-    "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
-    "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
-    "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
-    "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
-    fallthrough: "basic"
-  };
-  // Very basic readline/emacs-style bindings, which are standard on Mac.
-  keyMap.emacsy = {
-    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
-    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
-    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",
-    "Ctrl-O": "openLine"
-  };
-  keyMap.macDefault = {
-    "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
-    "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
-    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
-    "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
-    "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
-    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
-    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
-    fallthrough: ["basic", "emacsy"]
-  };
-  keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
-
-  // KEYMAP DISPATCH
-
-  function normalizeKeyName(name) {
-    var parts = name.split(/-(?!$)/), name = parts[parts.length - 1];
-    var alt, ctrl, shift, cmd;
-    for (var i = 0; i < parts.length - 1; i++) {
-      var mod = parts[i];
-      if (/^(cmd|meta|m)$/i.test(mod)) cmd = true;
-      else if (/^a(lt)?$/i.test(mod)) alt = true;
-      else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true;
-      else if (/^s(hift)$/i.test(mod)) shift = true;
-      else throw new Error("Unrecognized modifier name: " + mod);
-    }
-    if (alt) name = "Alt-" + name;
-    if (ctrl) name = "Ctrl-" + name;
-    if (cmd) name = "Cmd-" + name;
-    if (shift) name = "Shift-" + name;
-    return name;
-  }
-
-  // This is a kludge to keep keymaps mostly working as raw objects
-  // (backwards compatibility) while at the same time support features
-  // like normalization and multi-stroke key bindings. It compiles a
-  // new normalized keymap, and then updates the old object to reflect
-  // this.
-  CodeMirror.normalizeKeyMap = function(keymap) {
-    var copy = {};
-    for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
-      var value = keymap[keyname];
-      if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue;
-      if (value == "...") { delete keymap[keyname]; continue; }
-
-      var keys = map(keyname.split(" "), normalizeKeyName);
-      for (var i = 0; i < keys.length; i++) {
-        var val, name;
-        if (i == keys.length - 1) {
-          name = keys.join(" ");
-          val = value;
-        } else {
-          name = keys.slice(0, i + 1).join(" ");
-          val = "...";
-        }
-        var prev = copy[name];
-        if (!prev) copy[name] = val;
-        else if (prev != val) throw new Error("Inconsistent bindings for " + name);
-      }
-      delete keymap[keyname];
-    }
-    for (var prop in copy) keymap[prop] = copy[prop];
-    return keymap;
-  };
-
-  var lookupKey = CodeMirror.lookupKey = function(key, map, handle, context) {
-    map = getKeyMap(map);
-    var found = map.call ? map.call(key, context) : map[key];
-    if (found === false) return "nothing";
-    if (found === "...") return "multi";
-    if (found != null && handle(found)) return "handled";
-
-    if (map.fallthrough) {
-      if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
-        return lookupKey(key, map.fallthrough, handle, context);
-      for (var i = 0; i < map.fallthrough.length; i++) {
-        var result = lookupKey(key, map.fallthrough[i], handle, context);
-        if (result) return result;
-      }
-    }
-  };
-
-  // Modifier key presses don't count as 'real' key presses for the
-  // purpose of keymap fallthrough.
-  var isModifierKey = CodeMirror.isModifierKey = function(value) {
-    var name = typeof value == "string" ? value : keyNames[value.keyCode];
-    return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
-  };
-
-  // Look up the name of a key as indicated by an event object.
-  var keyName = CodeMirror.keyName = function(event, noShift) {
-    if (presto && event.keyCode == 34 && event["char"]) return false;
-    var base = keyNames[event.keyCode], name = base;
-    if (name == null || event.altGraphKey) return false;
-    if (event.altKey && base != "Alt") name = "Alt-" + name;
-    if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name;
-    if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name;
-    if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name;
-    return name;
-  };
-
-  function getKeyMap(val) {
-    return typeof val == "string" ? keyMap[val] : val;
-  }
-
-  // FROMTEXTAREA
-
-  CodeMirror.fromTextArea = function(textarea, options) {
-    options = options ? copyObj(options) : {};
-    options.value = textarea.value;
-    if (!options.tabindex && textarea.tabIndex)
-      options.tabindex = textarea.tabIndex;
-    if (!options.placeholder && textarea.placeholder)
-      options.placeholder = textarea.placeholder;
-    // Set autofocus to true if this textarea is focused, or if it has
-    // autofocus and no other element is focused.
-    if (options.autofocus == null) {
-      var hasFocus = activeElt();
-      options.autofocus = hasFocus == textarea ||
-        textarea.getAttribute("autofocus") != null && hasFocus == document.body;
-    }
-
-    function save() {textarea.value = cm.getValue();}
-    if (textarea.form) {
-      on(textarea.form, "submit", save);
-      // Deplorable hack to make the submit method do the right thing.
-      if (!options.leaveSubmitMethodAlone) {
-        var form = textarea.form, realSubmit = form.submit;
-        try {
-          var wrappedSubmit = form.submit = function() {
-            save();
-            form.submit = realSubmit;
-            form.submit();
-            form.submit = wrappedSubmit;
-          };
-        } catch(e) {}
-      }
-    }
-
-    options.finishInit = function(cm) {
-      cm.save = save;
-      cm.getTextArea = function() { return textarea; };
-      cm.toTextArea = function() {
-        cm.toTextArea = isNaN; // Prevent this from being ran twice
-        save();
-        textarea.parentNode.removeChild(cm.getWrapperElement());
-        textarea.style.display = "";
-        if (textarea.form) {
-          off(textarea.form, "submit", save);
-          if (typeof textarea.form.submit == "function")
-            textarea.form.submit = realSubmit;
-        }
-      };
-    };
-
-    textarea.style.display = "none";
-    var cm = CodeMirror(function(node) {
-      textarea.parentNode.insertBefore(node, textarea.nextSibling);
-    }, options);
-    return cm;
-  };
-
-  // STRING STREAM
-
-  // Fed to the mode parsers, provides helper functions to make
-  // parsers more succinct.
-
-  var StringStream = CodeMirror.StringStream = function(string, tabSize) {
-    this.pos = this.start = 0;
-    this.string = string;
-    this.tabSize = tabSize || 8;
-    this.lastColumnPos = this.lastColumnValue = 0;
-    this.lineStart = 0;
-  };
-
-  StringStream.prototype = {
-    eol: function() {return this.pos >= this.string.length;},
-    sol: function() {return this.pos == this.lineStart;},
-    peek: function() {return this.string.charAt(this.pos) || undefined;},
-    next: function() {
-      if (this.pos < this.string.length)
-        return this.string.charAt(this.pos++);
-    },
-    eat: function(match) {
-      var ch = this.string.charAt(this.pos);
-      if (typeof match == "string") var ok = ch == match;
-      else var ok = ch && (match.test ? match.test(ch) : match(ch));
-      if (ok) {++this.pos; return ch;}
-    },
-    eatWhile: function(match) {
-      var start = this.pos;
-      while (this.eat(match)){}
-      return this.pos > start;
-    },
-    eatSpace: function() {
-      var start = this.pos;
-      while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-      return this.pos > start;
-    },
-    skipToEnd: function() {this.pos = this.string.length;},
-    skipTo: function(ch) {
-      var found = this.string.indexOf(ch, this.pos);
-      if (found > -1) {this.pos = found; return true;}
-    },
-    backUp: function(n) {this.pos -= n;},
-    column: function() {
-      if (this.lastColumnPos < this.start) {
-        this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
-        this.lastColumnPos = this.start;
-      }
-      return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-    },
-    indentation: function() {
-      return countColumn(this.string, null, this.tabSize) -
-        (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-    },
-    match: function(pattern, consume, caseInsensitive) {
-      if (typeof pattern == "string") {
-        var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-        var substr = this.string.substr(this.pos, pattern.length);
-        if (cased(substr) == cased(pattern)) {
-          if (consume !== false) this.pos += pattern.length;
-          return true;
-        }
-      } else {
-        var match = this.string.slice(this.pos).match(pattern);
-        if (match && match.index > 0) return null;
-        if (match && consume !== false) this.pos += match[0].length;
-        return match;
-      }
-    },
-    current: function(){return this.string.slice(this.start, this.pos);},
-    hideFirstChars: function(n, inner) {
-      this.lineStart += n;
-      try { return inner(); }
-      finally { this.lineStart -= n; }
-    }
-  };
-
-  // TEXTMARKERS
-
-  // Created with markText and setBookmark methods. A TextMarker is a
-  // handle that can be used to clear or find a marked position in the
-  // document. Line objects hold arrays (markedSpans) containing
-  // {from, to, marker} object pointing to such marker objects, and
-  // indicating that such a marker is present on that line. Multiple
-  // lines may point to the same marker when it spans across lines.
-  // The spans will have null for their from/to properties when the
-  // marker continues beyond the start/end of the line. Markers have
-  // links back to the lines they currently touch.
-
-  var nextMarkerId = 0;
-
-  var TextMarker = CodeMirror.TextMarker = function(doc, type) {
-    this.lines = [];
-    this.type = type;
-    this.doc = doc;
-    this.id = ++nextMarkerId;
-  };
-  eventMixin(TextMarker);
-
-  // Clear the marker.
-  TextMarker.prototype.clear = function() {
-    if (this.explicitlyCleared) return;
-    var cm = this.doc.cm, withOp = cm && !cm.curOp;
-    if (withOp) startOperation(cm);
-    if (hasHandler(this, "clear")) {
-      var found = this.find();
-      if (found) signalLater(this, "clear", found.from, found.to);
-    }
-    var min = null, max = null;
-    for (var i = 0; i < this.lines.length; ++i) {
-      var line = this.lines[i];
-      var span = getMarkedSpanFor(line.markedSpans, this);
-      if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text");
-      else if (cm) {
-        if (span.to != null) max = lineNo(line);
-        if (span.from != null) min = lineNo(line);
-      }
-      line.markedSpans = removeMarkedSpan(line.markedSpans, span);
-      if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
-        updateLineHeight(line, textHeight(cm.display));
-    }
-    if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) {
-      var visual = visualLine(this.lines[i]), len = lineLength(visual);
-      if (len > cm.display.maxLineLength) {
-        cm.display.maxLine = visual;
-        cm.display.maxLineLength = len;
-        cm.display.maxLineChanged = true;
-      }
-    }
-
-    if (min != null && cm && this.collapsed) regChange(cm, min, max + 1);
-    this.lines.length = 0;
-    this.explicitlyCleared = true;
-    if (this.atomic && this.doc.cantEdit) {
-      this.doc.cantEdit = false;
-      if (cm) reCheckSelection(cm.doc);
-    }
-    if (cm) signalLater(cm, "markerCleared", cm, this);
-    if (withOp) endOperation(cm);
-    if (this.parent) this.parent.clear();
-  };
-
-  // Find the position of the marker in the document. Returns a {from,
-  // to} object by default. Side can be passed to get a specific side
-  // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
-  // Pos objects returned contain a line object, rather than a line
-  // number (used to prevent looking up the same line twice).
-  TextMarker.prototype.find = function(side, lineObj) {
-    if (side == null && this.type == "bookmark") side = 1;
-    var from, to;
-    for (var i = 0; i < this.lines.length; ++i) {
-      var line = this.lines[i];
-      var span = getMarkedSpanFor(line.markedSpans, this);
-      if (span.from != null) {
-        from = Pos(lineObj ? line : lineNo(line), span.from);
-        if (side == -1) return from;
-      }
-      if (span.to != null) {
-        to = Pos(lineObj ? line : lineNo(line), span.to);
-        if (side == 1) return to;
-      }
-    }
-    return from && {from: from, to: to};
-  };
-
-  // Signals that the marker's widget changed, and surrounding layout
-  // should be recomputed.
-  TextMarker.prototype.changed = function() {
-    var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
-    if (!pos || !cm) return;
-    runInOp(cm, function() {
-      var line = pos.line, lineN = lineNo(pos.line);
-      var view = findViewForLine(cm, lineN);
-      if (view) {
-        clearLineMeasurementCacheFor(view);
-        cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
-      }
-      cm.curOp.updateMaxLine = true;
-      if (!lineIsHidden(widget.doc, line) && widget.height != null) {
-        var oldHeight = widget.height;
-        widget.height = null;
-        var dHeight = widgetHeight(widget) - oldHeight;
-        if (dHeight)
-          updateLineHeight(line, line.height + dHeight);
-      }
-    });
-  };
-
-  TextMarker.prototype.attachLine = function(line) {
-    if (!this.lines.length && this.doc.cm) {
-      var op = this.doc.cm.curOp;
-      if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
-        (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this);
-    }
-    this.lines.push(line);
-  };
-  TextMarker.prototype.detachLine = function(line) {
-    this.lines.splice(indexOf(this.lines, line), 1);
-    if (!this.lines.length && this.doc.cm) {
-      var op = this.doc.cm.curOp;
-      (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this);
-    }
-  };
-
-  // Collapsed markers have unique ids, in order to be able to order
-  // them, which is needed for uniquely determining an outer marker
-  // when they overlap (they may nest, but not partially overlap).
-  var nextMarkerId = 0;
-
-  // Create a marker, wire it up to the right lines, and
-  function markText(doc, from, to, options, type) {
-    // Shared markers (across linked documents) are handled separately
-    // (markTextShared will call out to this again, once per
-    // document).
-    if (options && options.shared) return markTextShared(doc, from, to, options, type);
-    // Ensure we are in an operation.
-    if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
-
-    var marker = new TextMarker(doc, type), diff = cmp(from, to);
-    if (options) copyObj(options, marker, false);
-    // Don't connect empty markers unless clearWhenEmpty is false
-    if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
-      return marker;
-    if (marker.replacedWith) {
-      // Showing up as a widget implies collapsed (widget replaces text)
-      marker.collapsed = true;
-      marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget");
-      if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true");
-      if (options.insertLeft) marker.widgetNode.insertLeft = true;
-    }
-    if (marker.collapsed) {
-      if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
-          from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
-        throw new Error("Inserting collapsed marker partially overlapping an existing one");
-      sawCollapsedSpans = true;
-    }
-
-    if (marker.addToHistory)
-      addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN);
-
-    var curLine = from.line, cm = doc.cm, updateMaxLine;
-    doc.iter(curLine, to.line + 1, function(line) {
-      if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
-        updateMaxLine = true;
-      if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0);
-      addMarkedSpan(line, new MarkedSpan(marker,
-                                         curLine == from.line ? from.ch : null,
-                                         curLine == to.line ? to.ch : null));
-      ++curLine;
-    });
-    // lineIsHidden depends on the presence of the spans, so needs a second pass
-    if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) {
-      if (lineIsHidden(doc, line)) updateLineHeight(line, 0);
-    });
-
-    if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear(); });
-
-    if (marker.readOnly) {
-      sawReadOnlySpans = true;
-      if (doc.history.done.length || doc.history.undone.length)
-        doc.clearHistory();
-    }
-    if (marker.collapsed) {
-      marker.id = ++nextMarkerId;
-      marker.atomic = true;
-    }
-    if (cm) {
-      // Sync editor state
-      if (updateMaxLine) cm.curOp.updateMaxLine = true;
-      if (marker.collapsed)
-        regChange(cm, from.line, to.line + 1);
-      else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
-        for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
-      if (marker.atomic) reCheckSelection(cm.doc);
-      signalLater(cm, "markerAdded", cm, marker);
-    }
-    return marker;
-  }
-
-  // SHARED TEXTMARKERS
-
-  // A shared marker spans multiple linked documents. It is
-  // implemented as a meta-marker-object controlling multiple normal
-  // markers.
-  var SharedTextMarker = CodeMirror.SharedTextMarker = function(markers, primary) {
-    this.markers = markers;
-    this.primary = primary;
-    for (var i = 0; i < markers.length; ++i)
-      markers[i].parent = this;
-  };
-  eventMixin(SharedTextMarker);
-
-  SharedTextMarker.prototype.clear = function() {
-    if (this.explicitlyCleared) return;
-    this.explicitlyCleared = true;
-    for (var i = 0; i < this.markers.length; ++i)
-      this.markers[i].clear();
-    signalLater(this, "clear");
-  };
-  SharedTextMarker.prototype.find = function(side, lineObj) {
-    return this.primary.find(side, lineObj);
-  };
-
-  function markTextShared(doc, from, to, options, type) {
-    options = copyObj(options);
-    options.shared = false;
-    var markers = [markText(doc, from, to, options, type)], primary = markers[0];
-    var widget = options.widgetNode;
-    linkedDocs(doc, function(doc) {
-      if (widget) options.widgetNode = widget.cloneNode(true);
-      markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
-      for (var i = 0; i < doc.linked.length; ++i)
-        if (doc.linked[i].isParent) return;
-      primary = lst(markers);
-    });
-    return new SharedTextMarker(markers, primary);
-  }
-
-  function findSharedMarkers(doc) {
-    return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())),
-                         function(m) { return m.parent; });
-  }
-
-  function copySharedMarkers(doc, markers) {
-    for (var i = 0; i < markers.length; i++) {
-      var marker = markers[i], pos = marker.find();
-      var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
-      if (cmp(mFrom, mTo)) {
-        var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
-        marker.markers.push(subMark);
-        subMark.parent = marker;
-      }
-    }
-  }
-
-  function detachSharedMarkers(markers) {
-    for (var i = 0; i < markers.length; i++) {
-      var marker = markers[i], linked = [marker.primary.doc];;
-      linkedDocs(marker.primary.doc, function(d) { linked.push(d); });
-      for (var j = 0; j < marker.markers.length; j++) {
-        var subMarker = marker.markers[j];
-        if (indexOf(linked, subMarker.doc) == -1) {
-          subMarker.parent = null;
-          marker.markers.splice(j--, 1);
-        }
-      }
-    }
-  }
-
-  // TEXTMARKER SPANS
-
-  function MarkedSpan(marker, from, to) {
-    this.marker = marker;
-    this.from = from; this.to = to;
-  }
-
-  // Search an array of spans for a span matching the given marker.
-  function getMarkedSpanFor(spans, marker) {
-    if (spans) for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.marker == marker) return span;
-    }
-  }
-  // Remove a span from an array, returning undefined if no spans are
-  // left (we don't store arrays for lines without spans).
-  function removeMarkedSpan(spans, span) {
-    for (var r, i = 0; i < spans.length; ++i)
-      if (spans[i] != span) (r || (r = [])).push(spans[i]);
-    return r;
-  }
-  // Add a span to a line.
-  function addMarkedSpan(line, span) {
-    line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
-    span.marker.attachLine(line);
-  }
-
-  // Used for the algorithm that adjusts markers for a change in the
-  // document. These functions cut an array of spans at a given
-  // character position, returning an array of remaining chunks (or
-  // undefined if nothing remains).
-  function markedSpansBefore(old, startCh, isInsert) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
-      if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
-        var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
-        (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));
-      }
-    }
-    return nw;
-  }
-  function markedSpansAfter(old, endCh, isInsert) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
-      if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
-        var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
-        (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
-                                              span.to == null ? null : span.to - endCh));
-      }
-    }
-    return nw;
-  }
-
-  // Given a change object, compute the new set of marker spans that
-  // cover the line in which the change took place. Removes spans
-  // entirely within the change, reconnects spans belonging to the
-  // same marker that appear on both sides of the change, and cuts off
-  // spans partially within the change. Returns an array of span
-  // arrays with one element for each line in (after) the change.
-  function stretchSpansOverChange(doc, change) {
-    if (change.full) return null;
-    var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
-    var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
-    if (!oldFirst && !oldLast) return null;
-
-    var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;
-    // Get the spans that 'stick out' on both sides
-    var first = markedSpansBefore(oldFirst, startCh, isInsert);
-    var last = markedSpansAfter(oldLast, endCh, isInsert);
-
-    // Next, merge those two ends
-    var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);
-    if (first) {
-      // Fix up .to properties of first
-      for (var i = 0; i < first.length; ++i) {
-        var span = first[i];
-        if (span.to == null) {
-          var found = getMarkedSpanFor(last, span.marker);
-          if (!found) span.to = startCh;
-          else if (sameLine) span.to = found.to == null ? null : found.to + offset;
-        }
-      }
-    }
-    if (last) {
-      // Fix up .from in last (or move them into first in case of sameLine)
-      for (var i = 0; i < last.length; ++i) {
-        var span = last[i];
-        if (span.to != null) span.to += offset;
-        if (span.from == null) {
-          var found = getMarkedSpanFor(first, span.marker);
-          if (!found) {
-            span.from = offset;
-            if (sameLine) (first || (first = [])).push(span);
-          }
-        } else {
-          span.from += offset;
-          if (sameLine) (first || (first = [])).push(span);
-        }
-      }
-    }
-    // Make sure we didn't create any zero-length spans
-    if (first) first = clearEmptySpans(first);
-    if (last && last != first) last = clearEmptySpans(last);
-
-    var newMarkers = [first];
-    if (!sameLine) {
-      // Fill gap with whole-line-spans
-      var gap = change.text.length - 2, gapMarkers;
-      if (gap > 0 && first)
-        for (var i = 0; i < first.length; ++i)
-          if (first[i].to == null)
-            (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null));
-      for (var i = 0; i < gap; ++i)
-        newMarkers.push(gapMarkers);
-      newMarkers.push(last);
-    }
-    return newMarkers;
-  }
-
-  // Remove spans that are empty and don't have a clearWhenEmpty
-  // option of false.
-  function clearEmptySpans(spans) {
-    for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
-        spans.splice(i--, 1);
-    }
-    if (!spans.length) return null;
-    return spans;
-  }
-
-  // Used for un/re-doing changes from the history. Combines the
-  // result of computing the existing spans with the set of spans that
-  // existed in the history (so that deleting around a span and then
-  // undoing brings back the span).
-  function mergeOldSpans(doc, change) {
-    var old = getOldSpans(doc, change);
-    var stretched = stretchSpansOverChange(doc, change);
-    if (!old) return stretched;
-    if (!stretched) return old;
-
-    for (var i = 0; i < old.length; ++i) {
-      var oldCur = old[i], stretchCur = stretched[i];
-      if (oldCur && stretchCur) {
-        spans: for (var j = 0; j < stretchCur.length; ++j) {
-          var span = stretchCur[j];
-          for (var k = 0; k < oldCur.length; ++k)
-            if (oldCur[k].marker == span.marker) continue spans;
-          oldCur.push(span);
-        }
-      } else if (stretchCur) {
-        old[i] = stretchCur;
-      }
-    }
-    return old;
-  }
-
-  // Used to 'clip' out readOnly ranges when making a change.
-  function removeReadOnlyRanges(doc, from, to) {
-    var markers = null;
-    doc.iter(from.line, to.line + 1, function(line) {
-      if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-        var mark = line.markedSpans[i].marker;
-        if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
-          (markers || (markers = [])).push(mark);
-      }
-    });
-    if (!markers) return null;
-    var parts = [{from: from, to: to}];
-    for (var i = 0; i < markers.length; ++i) {
-      var mk = markers[i], m = mk.find(0);
-      for (var j = 0; j < parts.length; ++j) {
-        var p = parts[j];
-        if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue;
-        var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);
-        if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
-          newParts.push({from: p.from, to: m.from});
-        if (dto > 0 || !mk.inclusiveRight && !dto)
-          newParts.push({from: m.to, to: p.to});
-        parts.splice.apply(parts, newParts);
-        j += newParts.length - 1;
-      }
-    }
-    return parts;
-  }
-
-  // Connect or disconnect spans from a line.
-  function detachMarkedSpans(line) {
-    var spans = line.markedSpans;
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.detachLine(line);
-    line.markedSpans = null;
-  }
-  function attachMarkedSpans(line, spans) {
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.attachLine(line);
-    line.markedSpans = spans;
-  }
-
-  // Helpers used when computing which overlapping collapsed span
-  // counts as the larger one.
-  function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; }
-  function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; }
-
-  // Returns a number indicating which of two overlapping collapsed
-  // spans is larger (and thus includes the other). Falls back to
-  // comparing ids when the spans cover exactly the same range.
-  function compareCollapsedMarkers(a, b) {
-    var lenDiff = a.lines.length - b.lines.length;
-    if (lenDiff != 0) return lenDiff;
-    var aPos = a.find(), bPos = b.find();
-    var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);
-    if (fromCmp) return -fromCmp;
-    var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);
-    if (toCmp) return toCmp;
-    return b.id - a.id;
-  }
-
-  // Find out whether a line ends or starts in a collapsed span. If
-  // so, return the marker for that span.
-  function collapsedSpanAtSide(line, start) {
-    var sps = sawCollapsedSpans && line.markedSpans, found;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
-          (!found || compareCollapsedMarkers(found, sp.marker) < 0))
-        found = sp.marker;
-    }
-    return found;
-  }
-  function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); }
-  function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); }
-
-  // Test whether there exists a collapsed span that partially
-  // overlaps (covers the start or end, but not both) of a new span.
-  // Such overlap is not allowed.
-  function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
-    var line = getLine(doc, lineNo);
-    var sps = sawCollapsedSpans && line.markedSpans;
-    if (sps) for (var i = 0; i < sps.length; ++i) {
-      var sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      var found = sp.marker.find(0);
-      var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
-      var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
-      if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
-      if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
-          fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
-        return true;
-    }
-  }
-
-  // A visual line is a line as drawn on the screen. Folding, for
-  // example, can cause multiple logical lines to appear on the same
-  // visual line. This finds the start of the visual line that the
-  // given line is part of (usually that is the line itself).
-  function visualLine(line) {
-    var merged;
-    while (merged = collapsedSpanAtStart(line))
-      line = merged.find(-1, true).line;
-    return line;
-  }
-
-  // Returns an array of logical lines that continue the visual line
-  // started by the argument, or undefined if there are no such lines.
-  function visualLineContinued(line) {
-    var merged, lines;
-    while (merged = collapsedSpanAtEnd(line)) {
-      line = merged.find(1, true).line;
-      (lines || (lines = [])).push(line);
-    }
-    return lines;
-  }
-
-  // Get the line number of the start of the visual line that the
-  // given line number is part of.
-  function visualLineNo(doc, lineN) {
-    var line = getLine(doc, lineN), vis = visualLine(line);
-    if (line == vis) return lineN;
-    return lineNo(vis);
-  }
-  // Get the line number of the start of the next visual line after
-  // the given line.
-  function visualLineEndNo(doc, lineN) {
-    if (lineN > doc.lastLine()) return lineN;
-    var line = getLine(doc, lineN), merged;
-    if (!lineIsHidden(doc, line)) return lineN;
-    while (merged = collapsedSpanAtEnd(line))
-      line = merged.find(1, true).line;
-    return lineNo(line) + 1;
-  }
-
-  // Compute whether a line is hidden. Lines count as hidden when they
-  // are part of a visual line that starts with another line, or when
-  // they are entirely covered by collapsed, non-widget span.
-  function lineIsHidden(doc, line) {
-    var sps = sawCollapsedSpans && line.markedSpans;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      if (sp.from == null) return true;
-      if (sp.marker.widgetNode) continue;
-      if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
-        return true;
-    }
-  }
-  function lineIsHiddenInner(doc, line, span) {
-    if (span.to == null) {
-      var end = span.marker.find(1, true);
-      return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker));
-    }
-    if (span.marker.inclusiveRight && span.to == line.text.length)
-      return true;
-    for (var sp, i = 0; i < line.markedSpans.length; ++i) {
-      sp = line.markedSpans[i];
-      if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
-          (sp.to == null || sp.to != span.from) &&
-          (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
-          lineIsHiddenInner(doc, line, sp)) return true;
-    }
-  }
-
-  // LINE WIDGETS
-
-  // Line widgets are block elements displayed above or below a line.
-
-  var LineWidget = CodeMirror.LineWidget = function(doc, node, options) {
-    if (options) for (var opt in options) if (options.hasOwnProperty(opt))
-      this[opt] = options[opt];
-    this.doc = doc;
-    this.node = node;
-  };
-  eventMixin(LineWidget);
-
-  function adjustScrollWhenAboveVisible(cm, line, diff) {
-    if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
-      addToScrollPos(cm, null, diff);
-  }
-
-  LineWidget.prototype.clear = function() {
-    var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
-    if (no == null || !ws) return;
-    for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
-    if (!ws.length) line.widgets = null;
-    var height = widgetHeight(this);
-    updateLineHeight(line, Math.max(0, line.height - height));
-    if (cm) runInOp(cm, function() {
-      adjustScrollWhenAboveVisible(cm, line, -height);
-      regLineChange(cm, no, "widget");
-    });
-  };
-  LineWidget.prototype.changed = function() {
-    var oldH = this.height, cm = this.doc.cm, line = this.line;
-    this.height = null;
-    var diff = widgetHeight(this) - oldH;
-    if (!diff) return;
-    updateLineHeight(line, line.height + diff);
-    if (cm) runInOp(cm, function() {
-      cm.curOp.forceUpdate = true;
-      adjustScrollWhenAboveVisible(cm, line, diff);
-    });
-  };
-
-  function widgetHeight(widget) {
-    if (widget.height != null) return widget.height;
-    var cm = widget.doc.cm;
-    if (!cm) return 0;
-    if (!contains(document.body, widget.node)) {
-      var parentStyle = "position: relative;";
-      if (widget.coverGutter)
-        parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;";
-      if (widget.noHScroll)
-        parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
-      removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
-    }
-    return widget.height = widget.node.parentNode.offsetHeight;
-  }
-
-  function addLineWidget(doc, handle, node, options) {
-    var widget = new LineWidget(doc, node, options);
-    var cm = doc.cm;
-    if (cm && widget.noHScroll) cm.display.alignWidgets = true;
-    changeLine(doc, handle, "widget", function(line) {
-      var widgets = line.widgets || (line.widgets = []);
-      if (widget.insertAt == null) widgets.push(widget);
-      else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
-      widget.line = line;
-      if (cm && !lineIsHidden(doc, line)) {
-        var aboveVisible = heightAtLine(line) < doc.scrollTop;
-        updateLineHeight(line, line.height + widgetHeight(widget));
-        if (aboveVisible) addToScrollPos(cm, null, widget.height);
-        cm.curOp.forceUpdate = true;
-      }
-      return true;
-    });
-    return widget;
-  }
-
-  // LINE DATA STRUCTURE
-
-  // Line objects. These hold state related to a line, including
-  // highlighting info (the styles array).
-  var Line = CodeMirror.Line = function(text, markedSpans, estimateHeight) {
-    this.text = text;
-    attachMarkedSpans(this, markedSpans);
-    this.height = estimateHeight ? estimateHeight(this) : 1;
-  };
-  eventMixin(Line);
-  Line.prototype.lineNo = function() { return lineNo(this); };
-
-  // Change the content (text, markers) of a line. Automatically
-  // invalidates cached information and tries to re-estimate the
-  // line's height.
-  function updateLine(line, text, markedSpans, estimateHeight) {
-    line.text = text;
-    if (line.stateAfter) line.stateAfter = null;
-    if (line.styles) line.styles = null;
-    if (line.order != null) line.order = null;
-    detachMarkedSpans(line);
-    attachMarkedSpans(line, markedSpans);
-    var estHeight = estimateHeight ? estimateHeight(line) : 1;
-    if (estHeight != line.height) updateLineHeight(line, estHeight);
-  }
-
-  // Detach a line from the document tree and its markers.
-  function cleanUpLine(line) {
-    line.parent = null;
-    detachMarkedSpans(line);
-  }
-
-  function extractLineClasses(type, output) {
-    if (type) for (;;) {
-      var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);
-      if (!lineClass) break;
-      type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);
-      var prop = lineClass[1] ? "bgClass" : "textClass";
-      if (output[prop] == null)
-        output[prop] = lineClass[2];
-      else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
-        output[prop] += " " + lineClass[2];
-    }
-    return type;
-  }
-
-  function callBlankLine(mode, state) {
-    if (mode.blankLine) return mode.blankLine(state);
-    if (!mode.innerMode) return;
-    var inner = CodeMirror.innerMode(mode, state);
-    if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
-  }
-
-  function readToken(mode, stream, state, inner) {
-    for (var i = 0; i < 10; i++) {
-      if (inner) inner[0] = CodeMirror.innerMode(mode, state).mode;
-      var style = mode.token(stream, state);
-      if (stream.pos > stream.start) return style;
-    }
-    throw new Error("Mode " + mode.name + " failed to advance stream.");
-  }
-
-  // Utility for getTokenAt and getLineTokens
-  function takeToken(cm, pos, precise, asArray) {
-    function getObj(copy) {
-      return {start: stream.start, end: stream.pos,
-              string: stream.current(),
-              type: style || null,
-              state: copy ? copyState(doc.mode, state) : state};
-    }
-
-    var doc = cm.doc, mode = doc.mode, style;
-    pos = clipPos(doc, pos);
-    var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
-    var stream = new StringStream(line.text, cm.options.tabSize), tokens;
-    if (asArray) tokens = [];
-    while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
-      stream.start = stream.pos;
-      style = readToken(mode, stream, state);
-      if (asArray) tokens.push(getObj(true));
-    }
-    return asArray ? tokens : getObj();
-  }
-
-  // Run the given mode's parser over a line, calling f for each token.
-  function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
-    var flattenSpans = mode.flattenSpans;
-    if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
-    var curStart = 0, curStyle = null;
-    var stream = new StringStream(text, cm.options.tabSize), style;
-    var inner = cm.options.addModeClass && [null];
-    if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
-    while (!stream.eol()) {
-      if (stream.pos > cm.options.maxHighlightLength) {
-        flattenSpans = false;
-        if (forceToEnd) processLine(cm, text, state, stream.pos);
-        stream.pos = text.length;
-        style = null;
-      } else {
-        style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
-      }
-      if (inner) {
-        var mName = inner[0].name;
-        if (mName) style = "m-" + (style ? mName + " " + style : mName);
-      }
-      if (!flattenSpans || curStyle != style) {
-        while (curStart < stream.start) {
-          curStart = Math.min(stream.start, curStart + 50000);
-          f(curStart, curStyle);
-        }
-        curStyle = style;
-      }
-      stream.start = stream.pos;
-    }
-    while (curStart < stream.pos) {
-      // Webkit seems to refuse to render text nodes longer than 57444 characters
-      var pos = Math.min(stream.pos, curStart + 50000);
-      f(pos, curStyle);
-      curStart = pos;
-    }
-  }
-
-  // Compute a style array (an array starting with a mode generation
-  // -- for invalidation -- followed by pairs of end positions and
-  // style strings), which is used to highlight the tokens on the
-  // line.
-  function highlightLine(cm, line, state, forceToEnd) {
-    // A styles array always starts with a number identifying the
-    // mode/overlays that it is based on (for easy invalidation).
-    var st = [cm.state.modeGen], lineClasses = {};
-    // Compute the base array of styles
-    runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
-      st.push(end, style);
-    }, lineClasses, forceToEnd);
-
-    // Run overlays, adjust style array.
-    for (var o = 0; o < cm.state.overlays.length; ++o) {
-      var overlay = cm.state.overlays[o], i = 1, at = 0;
-      runMode(cm, line.text, overlay.mode, true, function(end, style) {
-        var start = i;
-        // Ensure there's a token end at the current position, and that i points at it
-        while (at < end) {
-          var i_end = st[i];
-          if (i_end > end)
-            st.splice(i, 1, end, st[i+1], i_end);
-          i += 2;
-          at = Math.min(end, i_end);
-        }
-        if (!style) return;
-        if (overlay.opaque) {
-          st.splice(start, i - start, end, "cm-overlay " + style);
-          i = start + 2;
-        } else {
-          for (; start < i; start += 2) {
-            var cur = st[start+1];
-            st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style;
-          }
-        }
-      }, lineClasses);
-    }
-
-    return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
-  }
-
-  function getLineStyles(cm, line, updateFrontier) {
-    if (!line.styles || line.styles[0] != cm.state.modeGen) {
-      var state = getStateBefore(cm, lineNo(line));
-      var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state);
-      line.stateAfter = state;
-      line.styles = result.styles;
-      if (result.classes) line.styleClasses = result.classes;
-      else if (line.styleClasses) line.styleClasses = null;
-      if (updateFrontier === cm.doc.frontier) cm.doc.frontier++;
-    }
-    return line.styles;
-  }
-
-  // Lightweight form of highlight -- proceed over this line and
-  // update state, but don't save a style array. Used for lines that
-  // aren't currently visible.
-  function processLine(cm, text, state, startAt) {
-    var mode = cm.doc.mode;
-    var stream = new StringStream(text, cm.options.tabSize);
-    stream.start = stream.pos = startAt || 0;
-    if (text == "") callBlankLine(mode, state);
-    while (!stream.eol()) {
-      readToken(mode, stream, state);
-      stream.start = stream.pos;
-    }
-  }
-
-  // Convert a style as returned by a mode (either null, or a string
-  // containing one or more styles) to a CSS style. This is cached,
-  // and also looks for line-wide styles.
-  var styleToClassCache = {}, styleToClassCacheWithMode = {};
-  function interpretTokenStyle(style, options) {
-    if (!style || /^\s*$/.test(style)) return null;
-    var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
-    return cache[style] ||
-      (cache[style] = style.replace(/\S+/g, "cm-$&"));
-  }
-
-  // Render the DOM representation of the text of a line. Also builds
-  // up a 'line map', which points at the DOM nodes that represent
-  // specific stretches of text, and is used by the measuring code.
-  // The returned object contains the DOM node, this map, and
-  // information about line-wide styles that were set by the mode.
-  function buildLineContent(cm, lineView) {
-    // The padding-right forces the element to have a 'border', which
-    // is needed on Webkit to be able to get line-level bounding
-    // rectangles for it (in measureChar).
-    var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
-    var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
-                   col: 0, pos: 0, cm: cm,
-                   trailingSpace: false,
-                   splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
-    lineView.measure = {};
-
-    // Iterate over the logical lines that make up this visual line.
-    for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
-      var line = i ? lineView.rest[i - 1] : lineView.line, order;
-      builder.pos = 0;
-      builder.addToken = buildToken;
-      // Optionally wire in some hacks into the token-rendering
-      // algorithm, to deal with browser quirks.
-      if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
-        builder.addToken = buildTokenBadBidi(builder.addToken, order);
-      builder.map = [];
-      var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
-      insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
-      if (line.styleClasses) {
-        if (line.styleClasses.bgClass)
-          builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");
-        if (line.styleClasses.textClass)
-          builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || "");
-      }
-
-      // Ensure at least a single node is present, for measuring.
-      if (builder.map.length == 0)
-        builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
-
-      // Store the map and a cache object for the current logical line
-      if (i == 0) {
-        lineView.measure.map = builder.map;
-        lineView.measure.cache = {};
-      } else {
-        (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map);
-        (lineView.measure.caches || (lineView.measure.caches = [])).push({});
-      }
-    }
-
-    // See issue #2901
-    if (webkit) {
-      var last = builder.content.lastChild
-      if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
-        builder.content.className = "cm-tab-wrap-hack";
-    }
-
-    signal(cm, "renderLine", cm, lineView.line, builder.pre);
-    if (builder.pre.className)
-      builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
-
-    return builder;
-  }
-
-  function defaultSpecialCharPlaceholder(ch) {
-    var token = elt("span", "\u2022", "cm-invalidchar");
-    token.title = "\\u" + ch.charCodeAt(0).toString(16);
-    token.setAttribute("aria-label", token.title);
-    return token;
-  }
-
-  // Build up the DOM representation for a single token, and add it to
-  // the line map. Takes care to render special characters separately.
-  function buildToken(builder, text, style, startStyle, endStyle, title, css) {
-    if (!text) return;
-    var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
-    var special = builder.cm.state.specialChars, mustWrap = false;
-    if (!special.test(text)) {
-      builder.col += text.length;
-      var content = document.createTextNode(displayText);
-      builder.map.push(builder.pos, builder.pos + text.length, content);
-      if (ie && ie_version < 9) mustWrap = true;
-      builder.pos += text.length;
-    } else {
-      var content = document.createDocumentFragment(), pos = 0;
-      while (true) {
-        special.lastIndex = pos;
-        var m = special.exec(text);
-        var skipped = m ? m.index - pos : text.length - pos;
-        if (skipped) {
-          var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
-          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
-          else content.appendChild(txt);
-          builder.map.push(builder.pos, builder.pos + skipped, txt);
-          builder.col += skipped;
-          builder.pos += skipped;
-        }
-        if (!m) break;
-        pos += skipped + 1;
-        if (m[0] == "\t") {
-          var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
-          var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
-          txt.setAttribute("role", "presentation");
-          txt.setAttribute("cm-text", "\t");
-          builder.col += tabWidth;
-        } else if (m[0] == "\r" || m[0] == "\n") {
-          var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
-          txt.setAttribute("cm-text", m[0]);
-          builder.col += 1;
-        } else {
-          var txt = builder.cm.options.specialCharPlaceholder(m[0]);
-          txt.setAttribute("cm-text", m[0]);
-          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
-          else content.appendChild(txt);
-          builder.col += 1;
-        }
-        builder.map.push(builder.pos, builder.pos + 1, txt);
-        builder.pos++;
-      }
-    }
-    builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32
-    if (style || startStyle || endStyle || mustWrap || css) {
-      var fullStyle = style || "";
-      if (startStyle) fullStyle += startStyle;
-      if (endStyle) fullStyle += endStyle;
-      var token = elt("span", [content], fullStyle, css);
-      if (title) token.title = title;
-      return builder.content.appendChild(token);
-    }
-    builder.content.appendChild(content);
-  }
-
-  function splitSpaces(text, trailingBefore) {
-    if (text.length > 1 && !/  /.test(text)) return text
-    var spaceBefore = trailingBefore, result = ""
-    for (var i = 0; i < text.length; i++) {
-      var ch = text.charAt(i)
-      if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
-        ch = "\u00a0"
-      result += ch
-      spaceBefore = ch == " "
-    }
-    return result
-  }
-
-  // Work around nonsense dimensions being reported for stretches of
-  // right-to-left text.
-  function buildTokenBadBidi(inner, order) {
-    return function(builder, text, style, startStyle, endStyle, title, css) {
-      style = style ? style + " cm-force-border" : "cm-force-border";
-      var start = builder.pos, end = start + text.length;
-      for (;;) {
-        // Find the part that overlaps with the start of this text
-        for (var i = 0; i < order.length; i++) {
-          var part = order[i];
-          if (part.to > start && part.from <= start) break;
-        }
-        if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css);
-        inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css);
-        startStyle = null;
-        text = text.slice(part.to - start);
-        start = part.to;
-      }
-    };
-  }
-
-  function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
-    var widget = !ignoreWidget && marker.widgetNode;
-    if (widget) builder.map.push(builder.pos, builder.pos + size, widget);
-    if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
-      if (!widget)
-        widget = builder.content.appendChild(document.createElement("span"));
-      widget.setAttribute("cm-marker", marker.id);
-    }
-    if (widget) {
-      builder.cm.display.input.setUneditable(widget);
-      builder.content.appendChild(widget);
-    }
-    builder.pos += size;
-    builder.trailingSpace = false
-  }
-
-  // Outputs a number of spans to make up a line, taking highlighting
-  // and marked text into account.
-  function insertLineContent(line, builder, styles) {
-    var spans = line.markedSpans, allText = line.text, at = 0;
-    if (!spans) {
-      for (var i = 1; i < styles.length; i+=2)
-        builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options));
-      return;
-    }
-
-    var len = allText.length, pos = 0, i = 1, text = "", style, css;
-    var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
-    for (;;) {
-      if (nextChange == pos) { // Update current marker set
-        spanStyle = spanEndStyle = spanStartStyle = title = css = "";
-        collapsed = null; nextChange = Infinity;
-        var foundBookmarks = [], endStyles
-        for (var j = 0; j < spans.length; ++j) {
-          var sp = spans[j], m = sp.marker;
-          if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
-            foundBookmarks.push(m);
-          } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
-            if (sp.to != null && sp.to != pos && nextChange > sp.to) {
-              nextChange = sp.to;
-              spanEndStyle = "";
-            }
-            if (m.className) spanStyle += " " + m.className;
-            if (m.css) css = (css ? css + ";" : "") + m.css;
-            if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
-            if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
-            if (m.title && !title) title = m.title;
-            if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
-              collapsed = sp;
-          } else if (sp.from > pos && nextChange > sp.from) {
-            nextChange = sp.from;
-          }
-        }
-        if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
-          if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
-
-        if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j)
-          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
-        if (collapsed && (collapsed.from || 0) == pos) {
-          buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
-                             collapsed.marker, collapsed.from == null);
-          if (collapsed.to == null) return;
-          if (collapsed.to == pos) collapsed = false;
-        }
-      }
-      if (pos >= len) break;
-
-      var upto = Math.min(len, nextChange);
-      while (true) {
-        if (text) {
-          var end = pos + text.length;
-          if (!collapsed) {
-            var tokenText = end > upto ? text.slice(0, upto - pos) : text;
-            builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
-                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css);
-          }
-          if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
-          pos = end;
-          spanStartStyle = "";
-        }
-        text = allText.slice(at, at = styles[i++]);
-        style = interpretTokenStyle(styles[i++], builder.cm.options);
-      }
-    }
-  }
-
-  // DOCUMENT DATA STRUCTURE
-
-  // By default, updates that start and end at the beginning of a line
-  // are treated specially, in order to make the association of line
-  // widgets and marker elements with the text behave more intuitive.
-  function isWholeLineUpdate(doc, change) {
-    return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
-      (!doc.cm || doc.cm.options.wholeLineUpdateBefore);
-  }
-
-  // Perform a change on the document data structure.
-  function updateDoc(doc, change, markedSpans, estimateHeight) {
-    function spansFor(n) {return markedSpans ? markedSpans[n] : null;}
-    function update(line, text, spans) {
-      updateLine(line, text, spans, estimateHeight);
-      signalLater(line, "change", line, change);
-    }
-    function linesFor(start, end) {
-      for (var i = start, result = []; i < end; ++i)
-        result.push(new Line(text[i], spansFor(i), estimateHeight));
-      return result;
-    }
-
-    var from = change.from, to = change.to, text = change.text;
-    var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
-    var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
-
-    // Adjust the line structure
-    if (change.full) {
-      doc.insert(0, linesFor(0, text.length));
-      doc.remove(text.length, doc.size - text.length);
-    } else if (isWholeLineUpdate(doc, change)) {
-      // This is a whole-line replace. Treated specially to make
-      // sure line objects move the way they are supposed to.
-      var added = linesFor(0, text.length - 1);
-      update(lastLine, lastLine.text, lastSpans);
-      if (nlines) doc.remove(from.line, nlines);
-      if (added.length) doc.insert(from.line, added);
-    } else if (firstLine == lastLine) {
-      if (text.length == 1) {
-        update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
-      } else {
-        var added = linesFor(1, text.length - 1);
-        added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
-        update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-        doc.insert(from.line + 1, added);
-      }
-    } else if (text.length == 1) {
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));
-      doc.remove(from.line + 1, nlines);
-    } else {
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-      update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
-      var added = linesFor(1, text.length - 1);
-      if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
-      doc.insert(from.line + 1, added);
-    }
-
-    signalLater(doc, "change", doc, change);
-  }
-
-  // The document is represented as a BTree consisting of leaves, with
-  // chunk of lines in them, and branches, with up to ten leaves or
-  // other branch nodes below them. The top node is always a branch
-  // node, and is the document object itself (meaning it has
-  // additional methods and properties).
-  //
-  // All nodes have parent links. The tree is used both to go from
-  // line numbers to line objects, and to go from objects to numbers.
-  // It also indexes by height, and is used to convert between height
-  // and line object, and to find the total height of the document.
-  //
-  // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
-
-  function LeafChunk(lines) {
-    this.lines = lines;
-    this.parent = null;
-    for (var i = 0, height = 0; i < lines.length; ++i) {
-      lines[i].parent = this;
-      height += lines[i].height;
-    }
-    this.height = height;
-  }
-
-  LeafChunk.prototype = {
-    chunkSize: function() { return this.lines.length; },
-    // Remove the n lines at offset 'at'.
-    removeInner: function(at, n) {
-      for (var i = at, e = at + n; i < e; ++i) {
-        var line = this.lines[i];
-        this.height -= line.height;
-        cleanUpLine(line);
-        signalLater(line, "delete");
-      }
-      this.lines.splice(at, n);
-    },
-    // Helper used to collapse a small branch into a single leaf.
-    collapse: function(lines) {
-      lines.push.apply(lines, this.lines);
-    },
-    // Insert the given array of lines at offset 'at', count them as
-    // having the given height.
-    insertInner: function(at, lines, height) {
-      this.height += height;
-      this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
-      for (var i = 0; i < lines.length; ++i) lines[i].parent = this;
-    },
-    // Used to iterate over a part of the tree.
-    iterN: function(at, n, op) {
-      for (var e = at + n; at < e; ++at)
-        if (op(this.lines[at])) return true;
-    }
-  };
-
-  function BranchChunk(children) {
-    this.children = children;
-    var size = 0, height = 0;
-    for (var i = 0; i < children.length; ++i) {
-      var ch = children[i];
-      size += ch.chunkSize(); height += ch.height;
-      ch.parent = this;
-    }
-    this.size = size;
-    this.height = height;
-    this.parent = null;
-  }
-
-  BranchChunk.prototype = {
-    chunkSize: function() { return this.size; },
-    removeInner: function(at, n) {
-      this.size -= n;
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var rm = Math.min(n, sz - at), oldHeight = child.height;
-          child.removeInner(at, rm);
-          this.height -= oldHeight - child.height;
-          if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
-          if ((n -= rm) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-      // If the result is smaller than 25 lines, ensure that it is a
-      // single leaf node.
-      if (this.size - n < 25 &&
-          (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
-        var lines = [];
-        this.collapse(lines);
-        this.children = [new LeafChunk(lines)];
-        this.children[0].parent = this;
-      }
-    },
-    collapse: function(lines) {
-      for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines);
-    },
-    insertInner: function(at, lines, height) {
-      this.size += lines.length;
-      this.height += height;
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at <= sz) {
-          child.insertInner(at, lines, height);
-          if (child.lines && child.lines.length > 50) {
-            // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
-            // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
-            var remaining = child.lines.length % 25 + 25
-            for (var pos = remaining; pos < child.lines.length;) {
-              var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));
-              child.height -= leaf.height;
-              this.children.splice(++i, 0, leaf);
-              leaf.parent = this;
-            }
-            child.lines = child.lines.slice(0, remaining);
-            this.maybeSpill();
-          }
-          break;
-        }
-        at -= sz;
-      }
-    },
-    // When a node has grown, check whether it should be split.
-    maybeSpill: function() {
-      if (this.children.length <= 10) return;
-      var me = this;
-      do {
-        var spilled = me.children.splice(me.children.length - 5, 5);
-        var sibling = new BranchChunk(spilled);
-        if (!me.parent) { // Become the parent node
-          var copy = new BranchChunk(me.children);
-          copy.parent = me;
-          me.children = [copy, sibling];
-          me = copy;
-       } else {
-          me.size -= sibling.size;
-          me.height -= sibling.height;
-          var myIndex = indexOf(me.parent.children, me);
-          me.parent.children.splice(myIndex + 1, 0, sibling);
-        }
-        sibling.parent = me.parent;
-      } while (me.children.length > 10);
-      me.parent.maybeSpill();
-    },
-    iterN: function(at, n, op) {
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var used = Math.min(n, sz - at);
-          if (child.iterN(at, used, op)) return true;
-          if ((n -= used) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-    }
-  };
-
-  var nextDocId = 0;
-  var Doc = CodeMirror.Doc = function(text, mode, firstLine, lineSep) {
-    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep);
-    if (firstLine == null) firstLine = 0;
-
-    BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
-    this.first = firstLine;
-    this.scrollTop = this.scrollLeft = 0;
-    this.cantEdit = false;
-    this.cleanGeneration = 1;
-    this.frontier = firstLine;
-    var start = Pos(firstLine, 0);
-    this.sel = simpleSelection(start);
-    this.history = new History(null);
-    this.id = ++nextDocId;
-    this.modeOption = mode;
-    this.lineSep = lineSep;
-    this.extend = false;
-
-    if (typeof text == "string") text = this.splitLines(text);
-    updateDoc(this, {from: start, to: start, text: text});
-    setSelection(this, simpleSelection(start), sel_dontScroll);
-  };
-
-  Doc.prototype = createObj(BranchChunk.prototype, {
-    constructor: Doc,
-    // Iterate over the document. Supports two forms -- with only one
-    // argument, it calls that for each line in the document. With
-    // three, it iterates over the range given by the first two (with
-    // the second being non-inclusive).
-    iter: function(from, to, op) {
-      if (op) this.iterN(from - this.first, to - from, op);
-      else this.iterN(this.first, this.first + this.size, from);
-    },
-
-    // Non-public interface for adding and removing lines.
-    insert: function(at, lines) {
-      var height = 0;
-      for (var i = 0; i < lines.length; ++i) height += lines[i].height;
-      this.insertInner(at - this.first, lines, height);
-    },
-    remove: function(at, n) { this.removeInner(at - this.first, n); },
-
-    // From here, the methods are part of the public interface. Most
-    // are also available from CodeMirror (editor) instances.
-
-    getValue: function(lineSep) {
-      var lines = getLines(this, this.first, this.first + this.size);
-      if (lineSep === false) return lines;
-      return lines.join(lineSep || this.lineSeparator());
-    },
-    setValue: docMethodOp(function(code) {
-      var top = Pos(this.first, 0), last = this.first + this.size - 1;
-      makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                        text: this.splitLines(code), origin: "setValue", full: true}, true);
-      setSelection(this, simpleSelection(top));
-    }),
-    replaceRange: function(code, from, to, origin) {
-      from = clipPos(this, from);
-      to = to ? clipPos(this, to) : from;
-      replaceRange(this, code, from, to, origin);
-    },
-    getRange: function(from, to, lineSep) {
-      var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
-      if (lineSep === false) return lines;
-      return lines.join(lineSep || this.lineSeparator());
-    },
-
-    getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
-
-    getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},
-    getLineNumber: function(line) {return lineNo(line);},
-
-    getLineHandleVisualStart: function(line) {
-      if (typeof line == "number") line = getLine(this, line);
-      return visualLine(line);
-    },
-
-    lineCount: function() {return this.size;},
-    firstLine: function() {return this.first;},
-    lastLine: function() {return this.first + this.size - 1;},
-
-    clipPos: function(pos) {return clipPos(this, pos);},
-
-    getCursor: function(start) {
-      var range = this.sel.primary(), pos;
-      if (start == null || start == "head") pos = range.head;
-      else if (start == "anchor") pos = range.anchor;
-      else if (start == "end" || start == "to" || start === false) pos = range.to();
-      else pos = range.from();
-      return pos;
-    },
-    listSelections: function() { return this.sel.ranges; },
-    somethingSelected: function() {return this.sel.somethingSelected();},
-
-    setCursor: docMethodOp(function(line, ch, options) {
-      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options);
-    }),
-    setSelection: docMethodOp(function(anchor, head, options) {
-      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options);
-    }),
-    extendSelection: docMethodOp(function(head, other, options) {
-      extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
-    }),
-    extendSelections: docMethodOp(function(heads, options) {
-      extendSelections(this, clipPosArray(this, heads), options);
-    }),
-    extendSelectionsBy: docMethodOp(function(f, options) {
-      var heads = map(this.sel.ranges, f);
-      extendSelections(this, clipPosArray(this, heads), options);
-    }),
-    setSelections: docMethodOp(function(ranges, primary, options) {
-      if (!ranges.length) return;
-      for (var i = 0, out = []; i < ranges.length; i++)
-        out[i] = new Range(clipPos(this, ranges[i].anchor),
-                           clipPos(this, ranges[i].head));
-      if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex);
-      setSelection(this, normalizeSelection(out, primary), options);
-    }),
-    addSelection: docMethodOp(function(anchor, head, options) {
-      var ranges = this.sel.ranges.slice(0);
-      ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
-      setSelection(this, normalizeSelection(ranges, ranges.length - 1), options);
-    }),
-
-    getSelection: function(lineSep) {
-      var ranges = this.sel.ranges, lines;
-      for (var i = 0; i < ranges.length; i++) {
-        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        lines = lines ? lines.concat(sel) : sel;
-      }
-      if (lineSep === false) return lines;
-      else return lines.join(lineSep || this.lineSeparator());
-    },
-    getSelections: function(lineSep) {
-      var parts = [], ranges = this.sel.ranges;
-      for (var i = 0; i < ranges.length; i++) {
-        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator());
-        parts[i] = sel;
-      }
-      return parts;
-    },
-    replaceSelection: function(code, collapse, origin) {
-      var dup = [];
-      for (var i = 0; i < this.sel.ranges.length; i++)
-        dup[i] = code;
-      this.replaceSelections(dup, collapse, origin || "+input");
-    },
-    replaceSelections: docMethodOp(function(code, collapse, origin) {
-      var changes = [], sel = this.sel;
-      for (var i = 0; i < sel.ranges.length; i++) {
-        var range = sel.ranges[i];
-        changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};
-      }
-      var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
-      for (var i = changes.length - 1; i >= 0; i--)
-        makeChange(this, changes[i]);
-      if (newSel) setSelectionReplaceHistory(this, newSel);
-      else if (this.cm) ensureCursorVisible(this.cm);
-    }),
-    undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
-    redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
-    undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),
-    redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}),
-
-    setExtending: function(val) {this.extend = val;},
-    getExtending: function() {return this.extend;},
-
-    historySize: function() {
-      var hist = this.history, done = 0, undone = 0;
-      for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done;
-      for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone;
-      return {undo: done, redo: undone};
-    },
-    clearHistory: function() {this.history = new History(this.history.maxGeneration);},
-
-    markClean: function() {
-      this.cleanGeneration = this.changeGeneration(true);
-    },
-    changeGeneration: function(forceSplit) {
-      if (forceSplit)
-        this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null;
-      return this.history.generation;
-    },
-    isClean: function (gen) {
-      return this.history.generation == (gen || this.cleanGeneration);
-    },
-
-    getHistory: function() {
-      return {done: copyHistoryArray(this.history.done),
-              undone: copyHistoryArray(this.history.undone)};
-    },
-    setHistory: function(histData) {
-      var hist = this.history = new History(this.history.maxGeneration);
-      hist.done = copyHistoryArray(histData.done.slice(0), null, true);
-      hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
-    },
-
-    addLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
-        var prop = where == "text" ? "textClass"
-                 : where == "background" ? "bgClass"
-                 : where == "gutter" ? "gutterClass" : "wrapClass";
-        if (!line[prop]) line[prop] = cls;
-        else if (classTest(cls).test(line[prop])) return false;
-        else line[prop] += " " + cls;
-        return true;
-      });
-    }),
-    removeLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
-        var prop = where == "text" ? "textClass"
-                 : where == "background" ? "bgClass"
-                 : where == "gutter" ? "gutterClass" : "wrapClass";
-        var cur = line[prop];
-        if (!cur) return false;
-        else if (cls == null) line[prop] = null;
-        else {
-          var found = cur.match(classTest(cls));
-          if (!found) return false;
-          var end = found.index + found[0].length;
-          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
-        }
-        return true;
-      });
-    }),
-
-    addLineWidget: docMethodOp(function(handle, node, options) {
-      return addLineWidget(this, handle, node, options);
-    }),
-    removeLineWidget: function(widget) { widget.clear(); },
-
-    markText: function(from, to, options) {
-      return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range");
-    },
-    setBookmark: function(pos, options) {
-      var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
-                      insertLeft: options && options.insertLeft,
-                      clearWhenEmpty: false, shared: options && options.shared,
-                      handleMouseEvents: options && options.handleMouseEvents};
-      pos = clipPos(this, pos);
-      return markText(this, pos, pos, realOpts, "bookmark");
-    },
-    findMarksAt: function(pos) {
-      pos = clipPos(this, pos);
-      var markers = [], spans = getLine(this, pos.line).markedSpans;
-      if (spans) for (var i = 0; i < spans.length; ++i) {
-        var span = spans[i];
-        if ((span.from == null || span.from <= pos.ch) &&
-            (span.to == null || span.to >= pos.ch))
-          markers.push(span.marker.parent || span.marker);
-      }
-      return markers;
-    },
-    findMarks: function(from, to, filter) {
-      from = clipPos(this, from); to = clipPos(this, to);
-      var found = [], lineNo = from.line;
-      this.iter(from.line, to.line + 1, function(line) {
-        var spans = line.markedSpans;
-        if (spans) for (var i = 0; i < spans.length; i++) {
-          var span = spans[i];
-          if (!(span.to != null && lineNo == from.line && from.ch >= span.to ||
-                span.from == null && lineNo != from.line ||
-                span.from != null && lineNo == to.line && span.from >= to.ch) &&
-              (!filter || filter(span.marker)))
-            found.push(span.marker.parent || span.marker);
-        }
-        ++lineNo;
-      });
-      return found;
-    },
-    getAllMarks: function() {
-      var markers = [];
-      this.iter(function(line) {
-        var sps = line.markedSpans;
-        if (sps) for (var i = 0; i < sps.length; ++i)
-          if (sps[i].from != null) markers.push(sps[i].marker);
-      });
-      return markers;
-    },
-
-    posFromIndex: function(off) {
-      var ch, lineNo = this.first, sepSize = this.lineSeparator().length;
-      this.iter(function(line) {
-        var sz = line.text.length + sepSize;
-        if (sz > off) { ch = off; return true; }
-        off -= sz;
-        ++lineNo;
-      });
-      return clipPos(this, Pos(lineNo, ch));
-    },
-    indexFromPos: function (coords) {
-      coords = clipPos(this, coords);
-      var index = coords.ch;
-      if (coords.line < this.first || coords.ch < 0) return 0;
-      var sepSize = this.lineSeparator().length;
-      this.iter(this.first, coords.line, function (line) {
-        index += line.text.length + sepSize;
-      });
-      return index;
-    },
-
-    copy: function(copyHistory) {
-      var doc = new Doc(getLines(this, this.first, this.first + this.size),
-                        this.modeOption, this.first, this.lineSep);
-      doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
-      doc.sel = this.sel;
-      doc.extend = false;
-      if (copyHistory) {
-        doc.history.undoDepth = this.history.undoDepth;
-        doc.setHistory(this.getHistory());
-      }
-      return doc;
-    },
-
-    linkedDoc: function(options) {
-      if (!options) options = {};
-      var from = this.first, to = this.first + this.size;
-      if (options.from != null && options.from > from) from = options.from;
-      if (options.to != null && options.to < to) to = options.to;
-      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep);
-      if (options.sharedHist) copy.history = this.history;
-      (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
-      copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
-      copySharedMarkers(copy, findSharedMarkers(this));
-      return copy;
-    },
-    unlinkDoc: function(other) {
-      if (other instanceof CodeMirror) other = other.doc;
-      if (this.linked) for (var i = 0; i < this.linked.length; ++i) {
-        var link = this.linked[i];
-        if (link.doc != other) continue;
-        this.linked.splice(i, 1);
-        other.unlinkDoc(this);
-        detachSharedMarkers(findSharedMarkers(this));
-        break;
-      }
-      // If the histories were shared, split them again
-      if (other.history == this.history) {
-        var splitIds = [other.id];
-        linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true);
-        other.history = new History(null);
-        other.history.done = copyHistoryArray(this.history.done, splitIds);
-        other.history.undone = copyHistoryArray(this.history.undone, splitIds);
-      }
-    },
-    iterLinkedDocs: function(f) {linkedDocs(this, f);},
-
-    getMode: function() {return this.mode;},
-    getEditor: function() {return this.cm;},
-
-    splitLines: function(str) {
-      if (this.lineSep) return str.split(this.lineSep);
-      return splitLinesAuto(str);
-    },
-    lineSeparator: function() { return this.lineSep || "\n"; }
-  });
-
-  // Public alias.
-  Doc.prototype.eachLine = Doc.prototype.iter;
-
-  // Set up methods on CodeMirror's prototype to redirect to the editor's document.
-  var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
-  for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
-    CodeMirror.prototype[prop] = (function(method) {
-      return function() {return method.apply(this.doc, arguments);};
-    })(Doc.prototype[prop]);
-
-  eventMixin(Doc);
-
-  // Call f for all linked documents.
-  function linkedDocs(doc, f, sharedHistOnly) {
-    function propagate(doc, skip, sharedHist) {
-      if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
-        var rel = doc.linked[i];
-        if (rel.doc == skip) continue;
-        var shared = sharedHist && rel.sharedHist;
-        if (sharedHistOnly && !shared) continue;
-        f(rel.doc, shared);
-        propagate(rel.doc, doc, shared);
-      }
-    }
-    propagate(doc, null, true);
-  }
-
-  // Attach a document to an editor.
-  function attachDoc(cm, doc) {
-    if (doc.cm) throw new Error("This document is already in use.");
-    cm.doc = doc;
-    doc.cm = cm;
-    estimateLineHeights(cm);
-    loadMode(cm);
-    if (!cm.options.lineWrapping) findMaxLine(cm);
-    cm.options.mode = doc.modeOption;
-    regChange(cm);
-  }
-
-  // LINE UTILITIES
-
-  // Find the line object corresponding to the given line number.
-  function getLine(doc, n) {
-    n -= doc.first;
-    if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document.");
-    for (var chunk = doc; !chunk.lines;) {
-      for (var i = 0;; ++i) {
-        var child = chunk.children[i], sz = child.chunkSize();
-        if (n < sz) { chunk = child; break; }
-        n -= sz;
-      }
-    }
-    return chunk.lines[n];
-  }
-
-  // Get the part of a document between two positions, as an array of
-  // strings.
-  function getBetween(doc, start, end) {
-    var out = [], n = start.line;
-    doc.iter(start.line, end.line + 1, function(line) {
-      var text = line.text;
-      if (n == end.line) text = text.slice(0, end.ch);
-      if (n == start.line) text = text.slice(start.ch);
-      out.push(text);
-      ++n;
-    });
-    return out;
-  }
-  // Get the lines between from and to, as array of strings.
-  function getLines(doc, from, to) {
-    var out = [];
-    doc.iter(from, to, function(line) { out.push(line.text); });
-    return out;
-  }
-
-  // Update the height of a line, propagating the height change
-  // upwards to parent nodes.
-  function updateLineHeight(line, height) {
-    var diff = height - line.height;
-    if (diff) for (var n = line; n; n = n.parent) n.height += diff;
-  }
-
-  // Given a line object, find its line number by walking up through
-  // its parent links.
-  function lineNo(line) {
-    if (line.parent == null) return null;
-    var cur = line.parent, no = indexOf(cur.lines, line);
-    for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
-      for (var i = 0;; ++i) {
-        if (chunk.children[i] == cur) break;
-        no += chunk.children[i].chunkSize();
-      }
-    }
-    return no + cur.first;
-  }
-
-  // Find the line at the given vertical position, using the height
-  // information in the document tree.
-  function lineAtHeight(chunk, h) {
-    var n = chunk.first;
-    outer: do {
-      for (var i = 0; i < chunk.children.length; ++i) {
-        var child = chunk.children[i], ch = child.height;
-        if (h < ch) { chunk = child; continue outer; }
-        h -= ch;
-        n += child.chunkSize();
-      }
-      return n;
-    } while (!chunk.lines);
-    for (var i = 0; i < chunk.lines.length; ++i) {
-      var line = chunk.lines[i], lh = line.height;
-      if (h < lh) break;
-      h -= lh;
-    }
-    return n + i;
-  }
-
-
-  // Find the height above the given line.
-  function heightAtLine(lineObj) {
-    lineObj = visualLine(lineObj);
-
-    var h = 0, chunk = lineObj.parent;
-    for (var i = 0; i < chunk.lines.length; ++i) {
-      var line = chunk.lines[i];
-      if (line == lineObj) break;
-      else h += line.height;
-    }
-    for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
-      for (var i = 0; i < p.children.length; ++i) {
-        var cur = p.children[i];
-        if (cur == chunk) break;
-        else h += cur.height;
-      }
-    }
-    return h;
-  }
-
-  // Get the bidi ordering for the given line (and cache it). Returns
-  // false for lines that are fully left-to-right, and an array of
-  // BidiSpan objects otherwise.
-  function getOrder(line) {
-    var order = line.order;
-    if (order == null) order = line.order = bidiOrdering(line.text);
-    return order;
-  }
-
-  // HISTORY
-
-  function History(startGen) {
-    // Arrays of change events and selections. Doing something adds an
-    // event to done and clears undo. Undoing moves events from done
-    // to undone, redoing moves them in the other direction.
-    this.done = []; this.undone = [];
-    this.undoDepth = Infinity;
-    // Used to track when changes can be merged into a single undo
-    // event
-    this.lastModTime = this.lastSelTime = 0;
-    this.lastOp = this.lastSelOp = null;
-    this.lastOrigin = this.lastSelOrigin = null;
-    // Used by the isClean() method
-    this.generation = this.maxGeneration = startGen || 1;
-  }
-
-  // Create a history change event from an updateDoc-style change
-  // object.
-  function historyChangeFromChange(doc, change) {
-    var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
-    attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
-    linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);
-    return histChange;
-  }
-
-  // Pop all selection events off the end of a history array. Stop at
-  // a change event.
-  function clearSelectionEvents(array) {
-    while (array.length) {
-      var last = lst(array);
-      if (last.ranges) array.pop();
-      else break;
-    }
-  }
-
-  // Find the top change event in the history. Pop off selection
-  // events that are in the way.
-  function lastChangeEvent(hist, force) {
-    if (force) {
-      clearSelectionEvents(hist.done);
-      return lst(hist.done);
-    } else if (hist.done.length && !lst(hist.done).ranges) {
-      return lst(hist.done);
-    } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
-      hist.done.pop();
-      return lst(hist.done);
-    }
-  }
-
-  // Register a change in the history. Merges changes that are within
-  // a single operation, ore are close together with an origin that
-  // allows merging (starting with "+") into a single event.
-  function addChangeToHistory(doc, change, selAfter, opId) {
-    var hist = doc.history;
-    hist.undone.length = 0;
-    var time = +new Date, cur;
-
-    if ((hist.lastOp == opId ||
-         hist.lastOrigin == change.origin && change.origin &&
-         ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
-          change.origin.charAt(0) == "*")) &&
-        (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
-      // Merge this change into the last event
-      var last = lst(cur.changes);
-      if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
-        // Optimized case for simple insertion -- don't want to add
-        // new changesets for every character typed
-        last.to = changeEnd(change);
-      } else {
-        // Add new sub-event
-        cur.changes.push(historyChangeFromChange(doc, change));
-      }
-    } else {
-      // Can not be merged, start a new event.
-      var before = lst(hist.done);
-      if (!before || !before.ranges)
-        pushSelectionToHistory(doc.sel, hist.done);
-      cur = {changes: [historyChangeFromChange(doc, change)],
-             generation: hist.generation};
-      hist.done.push(cur);
-      while (hist.done.length > hist.undoDepth) {
-        hist.done.shift();
-        if (!hist.done[0].ranges) hist.done.shift();
-      }
-    }
-    hist.done.push(selAfter);
-    hist.generation = ++hist.maxGeneration;
-    hist.lastModTime = hist.lastSelTime = time;
-    hist.lastOp = hist.lastSelOp = opId;
-    hist.lastOrigin = hist.lastSelOrigin = change.origin;
-
-    if (!last) signal(doc, "historyAdded");
-  }
-
-  function selectionEventCanBeMerged(doc, origin, prev, sel) {
-    var ch = origin.charAt(0);
-    return ch == "*" ||
-      ch == "+" &&
-      prev.ranges.length == sel.ranges.length &&
-      prev.somethingSelected() == sel.somethingSelected() &&
-      new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500);
-  }
-
-  // Called whenever the selection changes, sets the new selection as
-  // the pending selection in the history, and pushes the old pending
-  // selection into the 'done' array when it was significantly
-  // different (in number of selected ranges, emptiness, or time).
-  function addSelectionToHistory(doc, sel, opId, options) {
-    var hist = doc.history, origin = options && options.origin;
-
-    // A new event is started when the previous origin does not match
-    // the current, or the origins don't allow matching. Origins
-    // starting with * are always merged, those starting with + are
-    // merged when similar and close together in time.
-    if (opId == hist.lastSelOp ||
-        (origin && hist.lastSelOrigin == origin &&
-         (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
-          selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
-      hist.done[hist.done.length - 1] = sel;
-    else
-      pushSelectionToHistory(sel, hist.done);
-
-    hist.lastSelTime = +new Date;
-    hist.lastSelOrigin = origin;
-    hist.lastSelOp = opId;
-    if (options && options.clearRedo !== false)
-      clearSelectionEvents(hist.undone);
-  }
-
-  function pushSelectionToHistory(sel, dest) {
-    var top = lst(dest);
-    if (!(top && top.ranges && top.equals(sel)))
-      dest.push(sel);
-  }
-
-  // Used to store marked span information in the history.
-  function attachLocalSpans(doc, change, from, to) {
-    var existing = change["spans_" + doc.id], n = 0;
-    doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
-      if (line.markedSpans)
-        (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans;
-      ++n;
-    });
-  }
-
-  // When un/re-doing restores text containing marked spans, those
-  // that have been explicitly cleared should not be restored.
-  function removeClearedSpans(spans) {
-    if (!spans) return null;
-    for (var i = 0, out; i < spans.length; ++i) {
-      if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i); }
-      else if (out) out.push(spans[i]);
-    }
-    return !out ? spans : out.length ? out : null;
-  }
-
-  // Retrieve and filter the old marked spans stored in a change event.
-  function getOldSpans(doc, change) {
-    var found = change["spans_" + doc.id];
-    if (!found) return null;
-    for (var i = 0, nw = []; i < change.text.length; ++i)
-      nw.push(removeClearedSpans(found[i]));
-    return nw;
-  }
-
-  // Used both to provide a JSON-safe object in .getHistory, and, when
-  // detaching a document, to split the history in two
-  function copyHistoryArray(events, newGroup, instantiateSel) {
-    for (var i = 0, copy = []; i < events.length; ++i) {
-      var event = events[i];
-      if (event.ranges) {
-        copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event);
-        continue;
-      }
-      var changes = event.changes, newChanges = [];
-      copy.push({changes: newChanges});
-      for (var j = 0; j < changes.length; ++j) {
-        var change = changes[j], m;
-        newChanges.push({from: change.from, to: change.to, text: change.text});
-        if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
-          if (indexOf(newGroup, Number(m[1])) > -1) {
-            lst(newChanges)[prop] = change[prop];
-            delete change[prop];
-          }
-        }
-      }
-    }
-    return copy;
-  }
-
-  // Rebasing/resetting history to deal with externally-sourced changes
-
-  function rebaseHistSelSingle(pos, from, to, diff) {
-    if (to < pos.line) {
-      pos.line += diff;
-    } else if (from < pos.line) {
-      pos.line = from;
-      pos.ch = 0;
-    }
-  }
-
-  // Tries to rebase an array of history events given a change in the
-  // document. If the change touches the same lines as the event, the
-  // event, and everything 'behind' it, is discarded. If the change is
-  // before the event, the event's positions are updated. Uses a
-  // copy-on-write scheme for the positions, to avoid having to
-  // reallocate them all on every rebase, but also avoid problems with
-  // shared position objects being unsafely updated.
-  function rebaseHistArray(array, from, to, diff) {
-    for (var i = 0; i < array.length; ++i) {
-      var sub = array[i], ok = true;
-      if (sub.ranges) {
-        if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
-        for (var j = 0; j < sub.ranges.length; j++) {
-          rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff);
-          rebaseHistSelSingle(sub.ranges[j].head, from, to, diff);
-        }
-        continue;
-      }
-      for (var j = 0; j < sub.changes.length; ++j) {
-        var cur = sub.changes[j];
-        if (to < cur.from.line) {
-          cur.from = Pos(cur.from.line + diff, cur.from.ch);
-          cur.to = Pos(cur.to.line + diff, cur.to.ch);
-        } else if (from <= cur.to.line) {
-          ok = false;
-          break;
-        }
-      }
-      if (!ok) {
-        array.splice(0, i + 1);
-        i = 0;
-      }
-    }
-  }
-
-  function rebaseHist(hist, change) {
-    var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1;
-    rebaseHistArray(hist.done, from, to, diff);
-    rebaseHistArray(hist.undone, from, to, diff);
-  }
-
-  // EVENT UTILITIES
-
-  // Due to the fact that we still support jurassic IE versions, some
-  // compatibility wrappers are needed.
-
-  var e_preventDefault = CodeMirror.e_preventDefault = function(e) {
-    if (e.preventDefault) e.preventDefault();
-    else e.returnValue = false;
-  };
-  var e_stopPropagation = CodeMirror.e_stopPropagation = function(e) {
-    if (e.stopPropagation) e.stopPropagation();
-    else e.cancelBubble = true;
-  };
-  function e_defaultPrevented(e) {
-    return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false;
-  }
-  var e_stop = CodeMirror.e_stop = function(e) {e_preventDefault(e); e_stopPropagation(e);};
-
-  function e_target(e) {return e.target || e.srcElement;}
-  function e_button(e) {
-    var b = e.which;
-    if (b == null) {
-      if (e.button & 1) b = 1;
-      else if (e.button & 2) b = 3;
-      else if (e.button & 4) b = 2;
-    }
-    if (mac && e.ctrlKey && b == 1) b = 3;
-    return b;
-  }
-
-  // EVENT HANDLING
-
-  // Lightweight event framework. on/off also work on DOM nodes,
-  // registering native DOM handlers.
-
-  var on = CodeMirror.on = function(emitter, type, f) {
-    if (emitter.addEventListener)
-      emitter.addEventListener(type, f, false);
-    else if (emitter.attachEvent)
-      emitter.attachEvent("on" + type, f);
-    else {
-      var map = emitter._handlers || (emitter._handlers = {});
-      var arr = map[type] || (map[type] = []);
-      arr.push(f);
-    }
-  };
-
-  var noHandlers = []
-  function getHandlers(emitter, type, copy) {
-    var arr = emitter._handlers && emitter._handlers[type]
-    if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers
-    else return arr || noHandlers
-  }
-
-  var off = CodeMirror.off = function(emitter, type, f) {
-    if (emitter.removeEventListener)
-      emitter.removeEventListener(type, f, false);
-    else if (emitter.detachEvent)
-      emitter.detachEvent("on" + type, f);
-    else {
-      var handlers = getHandlers(emitter, type, false)
-      for (var i = 0; i < handlers.length; ++i)
-        if (handlers[i] == f) { handlers.splice(i, 1); break; }
-    }
-  };
-
-  var signal = CodeMirror.signal = function(emitter, type /*, values...*/) {
-    var handlers = getHandlers(emitter, type, true)
-    if (!handlers.length) return;
-    var args = Array.prototype.slice.call(arguments, 2);
-    for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args);
-  };
-
-  var orphanDelayedCallbacks = null;
-
-  // Often, we want to signal events at a point where we are in the
-  // middle of some work, but don't want the handler to start calling
-  // other methods on the editor, which might be in an inconsistent
-  // state or simply not expect any other events to happen.
-  // signalLater looks whether there are any handlers, and schedules
-  // them to be executed when the last operation ends, or, if no
-  // operation is active, when a timeout fires.
-  function signalLater(emitter, type /*, values...*/) {
-    var arr = getHandlers(emitter, type, false)
-    if (!arr.length) return;
-    var args = Array.prototype.slice.call(arguments, 2), list;
-    if (operationGroup) {
-      list = operationGroup.delayedCallbacks;
-    } else if (orphanDelayedCallbacks) {
-      list = orphanDelayedCallbacks;
-    } else {
-      list = orphanDelayedCallbacks = [];
-      setTimeout(fireOrphanDelayed, 0);
-    }
-    function bnd(f) {return function(){f.apply(null, args);};};
-    for (var i = 0; i < arr.length; ++i)
-      list.push(bnd(arr[i]));
-  }
-
-  function fireOrphanDelayed() {
-    var delayed = orphanDelayedCallbacks;
-    orphanDelayedCallbacks = null;
-    for (var i = 0; i < delayed.length; ++i) delayed[i]();
-  }
-
-  // The DOM events that CodeMirror handles can be overridden by
-  // registering a (non-DOM) handler on the editor for the event name,
-  // and preventDefault-ing the event in that handler.
-  function signalDOMEvent(cm, e, override) {
-    if (typeof e == "string")
-      e = {type: e, preventDefault: function() { this.defaultPrevented = true; }};
-    signal(cm, override || e.type, cm, e);
-    return e_defaultPrevented(e) || e.codemirrorIgnore;
-  }
-
-  function signalCursorActivity(cm) {
-    var arr = cm._handlers && cm._handlers.cursorActivity;
-    if (!arr) return;
-    var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);
-    for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1)
-      set.push(arr[i]);
-  }
-
-  function hasHandler(emitter, type) {
-    return getHandlers(emitter, type).length > 0
-  }
-
-  // Add on and off methods to a constructor's prototype, to make
-  // registering events on such objects more convenient.
-  function eventMixin(ctor) {
-    ctor.prototype.on = function(type, f) {on(this, type, f);};
-    ctor.prototype.off = function(type, f) {off(this, type, f);};
-  }
-
-  // MISC UTILITIES
-
-  // Number of pixels added to scroller and sizer to hide scrollbar
-  var scrollerGap = 30;
-
-  // Returned or thrown by various protocols to signal 'I'm not
-  // handling this'.
-  var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
-
-  // Reused option objects for setSelection & friends
-  var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"};
-
-  function Delayed() {this.id = null;}
-  Delayed.prototype.set = function(ms, f) {
-    clearTimeout(this.id);
-    this.id = setTimeout(f, ms);
-  };
-
-  // Counts the column offset in a string, taking tabs into account.
-  // Used mostly to find indentation.
-  var countColumn = CodeMirror.countColumn = function(string, end, tabSize, startIndex, startValue) {
-    if (end == null) {
-      end = string.search(/[^\s\u00a0]/);
-      if (end == -1) end = string.length;
-    }
-    for (var i = startIndex || 0, n = startValue || 0;;) {
-      var nextTab = string.indexOf("\t", i);
-      if (nextTab < 0 || nextTab >= end)
-        return n + (end - i);
-      n += nextTab - i;
-      n += tabSize - (n % tabSize);
-      i = nextTab + 1;
-    }
-  };
-
-  // The inverse of countColumn -- find the offset that corresponds to
-  // a particular column.
-  var findColumn = CodeMirror.findColumn = function(string, goal, tabSize) {
-    for (var pos = 0, col = 0;;) {
-      var nextTab = string.indexOf("\t", pos);
-      if (nextTab == -1) nextTab = string.length;
-      var skipped = nextTab - pos;
-      if (nextTab == string.length || col + skipped >= goal)
-        return pos + Math.min(skipped, goal - col);
-      col += nextTab - pos;
-      col += tabSize - (col % tabSize);
-      pos = nextTab + 1;
-      if (col >= goal) return pos;
-    }
-  }
-
-  var spaceStrs = [""];
-  function spaceStr(n) {
-    while (spaceStrs.length <= n)
-      spaceStrs.push(lst(spaceStrs) + " ");
-    return spaceStrs[n];
-  }
-
-  function lst(arr) { return arr[arr.length-1]; }
-
-  var selectInput = function(node) { node.select(); };
-  if (ios) // Mobile Safari apparently has a bug where select() is broken.
-    selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; };
-  else if (ie) // Suppress mysterious IE10 errors
-    selectInput = function(node) { try { node.select(); } catch(_e) {} };
-
-  function indexOf(array, elt) {
-    for (var i = 0; i < array.length; ++i)
-      if (array[i] == elt) return i;
-    return -1;
-  }
-  function map(array, f) {
-    var out = [];
-    for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
-    return out;
-  }
-
-  function nothing() {}
-
-  function createObj(base, props) {
-    var inst;
-    if (Object.create) {
-      inst = Object.create(base);
-    } else {
-      nothing.prototype = base;
-      inst = new nothing();
-    }
-    if (props) copyObj(props, inst);
-    return inst;
-  };
-
-  function copyObj(obj, target, overwrite) {
-    if (!target) target = {};
-    for (var prop in obj)
-      if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
-        target[prop] = obj[prop];
-    return target;
-  }
-
-  function bind(f) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    return function(){return f.apply(null, args);};
-  }
-
-  var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
-  var isWordCharBasic = CodeMirror.isWordChar = function(ch) {
-    return /\w/.test(ch) || ch > "\x80" &&
-      (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
-  };
-  function isWordChar(ch, helper) {
-    if (!helper) return isWordCharBasic(ch);
-    if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) return true;
-    return helper.test(ch);
-  }
-
-  function isEmpty(obj) {
-    for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false;
-    return true;
-  }
-
-  // Extending unicode characters. A series of a non-extending char +
-  // any number of extending chars is treated as a single unit as far
-  // as editing and measuring is concerned. This is not fully correct,
-  // since some scripts/fonts/browsers also treat other configurations
-  // of code points as a group.
-  var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
-  function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); }
-
-  // DOM UTILITIES
-
-  function elt(tag, content, className, style) {
-    var e = document.createElement(tag);
-    if (className) e.className = className;
-    if (style) e.style.cssText = style;
-    if (typeof content == "string") e.appendChild(document.createTextNode(content));
-    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
-    return e;
-  }
-
-  var range;
-  if (document.createRange) range = function(node, start, end, endNode) {
-    var r = document.createRange();
-    r.setEnd(endNode || node, end);
-    r.setStart(node, start);
-    return r;
-  };
-  else range = function(node, start, end) {
-    var r = document.body.createTextRange();
-    try { r.moveToElementText(node.parentNode); }
-    catch(e) { return r; }
-    r.collapse(true);
-    r.moveEnd("character", end);
-    r.moveStart("character", start);
-    return r;
-  };
-
-  function removeChildren(e) {
-    for (var count = e.childNodes.length; count > 0; --count)
-      e.removeChild(e.firstChild);
-    return e;
-  }
-
-  function removeChildrenAndAdd(parent, e) {
-    return removeChildren(parent).appendChild(e);
-  }
-
-  var contains = CodeMirror.contains = function(parent, child) {
-    if (child.nodeType == 3) // Android browser always returns false when child is a textnode
-      child = child.parentNode;
-    if (parent.contains)
-      return parent.contains(child);
-    do {
-      if (child.nodeType == 11) child = child.host;
-      if (child == parent) return true;
-    } while (child = child.parentNode);
-  };
-
-  function activeElt() {
-    var activeElement = document.activeElement;
-    while (activeElement && activeElement.root && activeElement.root.activeElement)
-      activeElement = activeElement.root.activeElement;
-    return activeElement;
-  }
-  // Older versions of IE throws unspecified error when touching
-  // document.activeElement in some cases (during loading, in iframe)
-  if (ie && ie_version < 11) activeElt = function() {
-    try { return document.activeElement; }
-    catch(e) { return document.body; }
-  };
-
-  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); }
-  var rmClass = CodeMirror.rmClass = function(node, cls) {
-    var current = node.className;
-    var match = classTest(cls).exec(current);
-    if (match) {
-      var after = current.slice(match.index + match[0].length);
-      node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
-    }
-  };
-  var addClass = CodeMirror.addClass = function(node, cls) {
-    var current = node.className;
-    if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls;
-  };
-  function joinClasses(a, b) {
-    var as = a.split(" ");
-    for (var i = 0; i < as.length; i++)
-      if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i];
-    return b;
-  }
-
-  // WINDOW-WIDE EVENTS
-
-  // These must be handled carefully, because naively registering a
-  // handler for each editor will cause the editors to never be
-  // garbage collected.
-
-  function forEachCodeMirror(f) {
-    if (!document.body.getElementsByClassName) return;
-    var byClass = document.body.getElementsByClassName("CodeMirror");
-    for (var i = 0; i < byClass.length; i++) {
-      var cm = byClass[i].CodeMirror;
-      if (cm) f(cm);
-    }
-  }
-
-  var globalsRegistered = false;
-  function ensureGlobalHandlers() {
-    if (globalsRegistered) return;
-    registerGlobalHandlers();
-    globalsRegistered = true;
-  }
-  function registerGlobalHandlers() {
-    // When the window resizes, we need to refresh active editors.
-    var resizeTimer;
-    on(window, "resize", function() {
-      if (resizeTimer == null) resizeTimer = setTimeout(function() {
-        resizeTimer = null;
-        forEachCodeMirror(onResize);
-      }, 100);
-    });
-    // When the window loses focus, we want to show the editor as blurred
-    on(window, "blur", function() {
-      forEachCodeMirror(onBlur);
-    });
-  }
-
-  // FEATURE DETECTION
-
-  // Detect drag-and-drop
-  var dragAndDrop = function() {
-    // There is *some* kind of drag-and-drop support in IE6-8, but I
-    // couldn't get it to work yet.
-    if (ie && ie_version < 9) return false;
-    var div = elt('div');
-    return "draggable" in div || "dragDrop" in div;
-  }();
-
-  var zwspSupported;
-  function zeroWidthElement(measure) {
-    if (zwspSupported == null) {
-      var test = elt("span", "\u200b");
-      removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
-      if (measure.firstChild.offsetHeight != 0)
-        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8);
-    }
-    var node = zwspSupported ? elt("span", "\u200b") :
-      elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
-    node.setAttribute("cm-text", "");
-    return node;
-  }
-
-  // Feature-detect IE's crummy client rect reporting for bidi text
-  var badBidiRects;
-  function hasBadBidiRects(measure) {
-    if (badBidiRects != null) return badBidiRects;
-    var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
-    var r0 = range(txt, 0, 1).getBoundingClientRect();
-    var r1 = range(txt, 1, 2).getBoundingClientRect();
-    removeChildren(measure);
-    if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
-    return badBidiRects = (r1.right - r0.right < 3);
-  }
-
-  // See if "".split is the broken IE version, if so, provide an
-  // alternative way to split lines.
-  var splitLinesAuto = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
-    var pos = 0, result = [], l = string.length;
-    while (pos <= l) {
-      var nl = string.indexOf("\n", pos);
-      if (nl == -1) nl = string.length;
-      var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
-      var rt = line.indexOf("\r");
-      if (rt != -1) {
-        result.push(line.slice(0, rt));
-        pos += rt + 1;
-      } else {
-        result.push(line);
-        pos = nl + 1;
-      }
-    }
-    return result;
-  } : function(string){return string.split(/\r\n?|\n/);};
-
-  var hasSelection = window.getSelection ? function(te) {
-    try { return te.selectionStart != te.selectionEnd; }
-    catch(e) { return false; }
-  } : function(te) {
-    try {var range = te.ownerDocument.selection.createRange();}
-    catch(e) {}
-    if (!range || range.parentElement() != te) return false;
-    return range.compareEndPoints("StartToEnd", range) != 0;
-  };
-
-  var hasCopyEvent = (function() {
-    var e = elt("div");
-    if ("oncopy" in e) return true;
-    e.setAttribute("oncopy", "return;");
-    return typeof e.oncopy == "function";
-  })();
-
-  var badZoomedRects = null;
-  function hasBadZoomedRects(measure) {
-    if (badZoomedRects != null) return badZoomedRects;
-    var node = removeChildrenAndAdd(measure, elt("span", "x"));
-    var normal = node.getBoundingClientRect();
-    var fromRange = range(node, 0, 1).getBoundingClientRect();
-    return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1;
-  }
-
-  // KEY NAMES
-
-  var keyNames = CodeMirror.keyNames = {
-    3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
-    19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
-    36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-    46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
-    106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
-    173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-    221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
-    63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
-  };
-  (function() {
-    // Number keys
-    for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);
-    // Alphabetic keys
-    for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i);
-    // Function keys
-    for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
-  })();
-
-  // BIDI HELPERS
-
-  function iterateBidiSections(order, from, to, f) {
-    if (!order) return f(from, to, "ltr");
-    var found = false;
-    for (var i = 0; i < order.length; ++i) {
-      var part = order[i];
-      if (part.from < to && part.to > from || from == to && part.to == from) {
-        f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
-        found = true;
-      }
-    }
-    if (!found) f(from, to, "ltr");
-  }
-
-  function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }
-  function bidiRight(part) { return part.level % 2 ? part.from : part.to; }
-
-  function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; }
-  function lineRight(line) {
-    var order = getOrder(line);
-    if (!order) return line.text.length;
-    return bidiRight(lst(order));
-  }
-
-  function lineStart(cm, lineN) {
-    var line = getLine(cm.doc, lineN);
-    var visual = visualLine(line);
-    if (visual != line) lineN = lineNo(visual);
-    var order = getOrder(visual);
-    var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual);
-    return Pos(lineN, ch);
-  }
-  function lineEnd(cm, lineN) {
-    var merged, line = getLine(cm.doc, lineN);
-    while (merged = collapsedSpanAtEnd(line)) {
-      line = merged.find(1, true).line;
-      lineN = null;
-    }
-    var order = getOrder(line);
-    var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
-    return Pos(lineN == null ? lineNo(line) : lineN, ch);
-  }
-  function lineStartSmart(cm, pos) {
-    var start = lineStart(cm, pos.line);
-    var line = getLine(cm.doc, start.line);
-    var order = getOrder(line);
-    if (!order || order[0].level == 0) {
-      var firstNonWS = Math.max(0, line.text.search(/\S/));
-      var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
-      return Pos(start.line, inWS ? 0 : firstNonWS);
-    }
-    return start;
-  }
-
-  function compareBidiLevel(order, a, b) {
-    var linedir = order[0].level;
-    if (a == linedir) return true;
-    if (b == linedir) return false;
-    return a < b;
-  }
-  var bidiOther;
-  function getBidiPartAt(order, pos) {
-    bidiOther = null;
-    for (var i = 0, found; i < order.length; ++i) {
-      var cur = order[i];
-      if (cur.from < pos && cur.to > pos) return i;
-      if ((cur.from == pos || cur.to == pos)) {
-        if (found == null) {
-          found = i;
-        } else if (compareBidiLevel(order, cur.level, order[found].level)) {
-          if (cur.from != cur.to) bidiOther = found;
-          return i;
-        } else {
-          if (cur.from != cur.to) bidiOther = i;
-          return found;
-        }
-      }
-    }
-    return found;
-  }
-
-  function moveInLine(line, pos, dir, byUnit) {
-    if (!byUnit) return pos + dir;
-    do pos += dir;
-    while (pos > 0 && isExtendingChar(line.text.charAt(pos)));
-    return pos;
-  }
-
-  // This is needed in order to move 'visually' through bi-directional
-  // text -- i.e., pressing left should make the cursor go left, even
-  // when in RTL text. The tricky part is the 'jumps', where RTL and
-  // LTR text touch each other. This often requires the cursor offset
-  // to move more than one unit, in order to visually move one unit.
-  function moveVisually(line, start, dir, byUnit) {
-    var bidi = getOrder(line);
-    if (!bidi) return moveLogically(line, start, dir, byUnit);
-    var pos = getBidiPartAt(bidi, start), part = bidi[pos];
-    var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit);
-
-    for (;;) {
-      if (target > part.from && target < part.to) return target;
-      if (target == part.from || target == part.to) {
-        if (getBidiPartAt(bidi, target) == pos) return target;
-        part = bidi[pos += dir];
-        return (dir > 0) == part.level % 2 ? part.to : part.from;
-      } else {
-        part = bidi[pos += dir];
-        if (!part) return null;
-        if ((dir > 0) == part.level % 2)
-          target = moveInLine(line, part.to, -1, byUnit);
-        else
-          target = moveInLine(line, part.from, 1, byUnit);
-      }
-    }
-  }
-
-  function moveLogically(line, start, dir, byUnit) {
-    var target = start + dir;
-    if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir;
-    return target < 0 || target > line.text.length ? null : target;
-  }
-
-  // Bidirectional ordering algorithm
-  // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
-  // that this (partially) implements.
-
-  // One-char codes used for character types:
-  // L (L):   Left-to-Right
-  // R (R):   Right-to-Left
-  // r (AL):  Right-to-Left Arabic
-  // 1 (EN):  European Number
-  // + (ES):  European Number Separator
-  // % (ET):  European Number Terminator
-  // n (AN):  Arabic Number
-  // , (CS):  Common Number Separator
-  // m (NSM): Non-Spacing Mark
-  // b (BN):  Boundary Neutral
-  // s (B):   Paragraph Separator
-  // t (S):   Segment Separator
-  // w (WS):  Whitespace
-  // N (ON):  Other Neutrals
-
-  // Returns null if characters are ordered as they appear
-  // (left-to-right), or an array of sections ({from, to, level}
-  // objects) in the order in which they occur visually.
-  var bidiOrdering = (function() {
-    // Character types for codepoints 0 to 0xff
-    var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";
-    // Character types for codepoints 0x600 to 0x6ff
-    var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm";
-    function charType(code) {
-      if (code <= 0xf7) return lowTypes.charAt(code);
-      else if (0x590 <= code && code <= 0x5f4) return "R";
-      else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600);
-      else if (0x6ee <= code && code <= 0x8ac) return "r";
-      else if (0x2000 <= code && code <= 0x200b) return "w";
-      else if (code == 0x200c) return "b";
-      else return "L";
-    }
-
-    var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
-    var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;
-    // Browsers seem to always treat the boundaries of block elements as being L.
-    var outerType = "L";
-
-    function BidiSpan(level, from, to) {
-      this.level = level;
-      this.from = from; this.to = to;
-    }
-
-    return function(str) {
-      if (!bidiRE.test(str)) return false;
-      var len = str.length, types = [];
-      for (var i = 0, type; i < len; ++i)
-        types.push(type = charType(str.charCodeAt(i)));
-
-      // W1. Examine each non-spacing mark (NSM) in the level run, and
-      // change the type of the NSM to the type of the previous
-      // character. If the NSM is at the start of the level run, it will
-      // get the type of sor.
-      for (var i = 0, prev = outerType; i < len; ++i) {
-        var type = types[i];
-        if (type == "m") types[i] = prev;
-        else prev = type;
-      }
-
-      // W2. Search backwards from each instance of a European number
-      // until the first strong type (R, L, AL, or sor) is found. If an
-      // AL is found, change the type of the European number to Arabic
-      // number.
-      // W3. Change all ALs to R.
-      for (var i = 0, cur = outerType; i < len; ++i) {
-        var type = types[i];
-        if (type == "1" && cur == "r") types[i] = "n";
-        else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R"; }
-      }
-
-      // W4. A single European separator between two European numbers
-      // changes to a European number. A single common separator between
-      // two numbers of the same type changes to that type.
-      for (var i = 1, prev = types[0]; i < len - 1; ++i) {
-        var type = types[i];
-        if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1";
-        else if (type == "," && prev == types[i+1] &&
-                 (prev == "1" || prev == "n")) types[i] = prev;
-        prev = type;
-      }
-
-      // W5. A sequence of European terminators adjacent to European
-      // numbers changes to all European numbers.
-      // W6. Otherwise, separators and terminators change to Other
-      // Neutral.
-      for (var i = 0; i < len; ++i) {
-        var type = types[i];
-        if (type == ",") types[i] = "N";
-        else if (type == "%") {
-          for (var end = i + 1; end < len && types[end] == "%"; ++end) {}
-          var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";
-          for (var j = i; j < end; ++j) types[j] = replace;
-          i = end - 1;
-        }
-      }
-
-      // W7. Search backwards from each instance of a European number
-      // until the first strong type (R, L, or sor) is found. If an L is
-      // found, then change the type of the European number to L.
-      for (var i = 0, cur = outerType; i < len; ++i) {
-        var type = types[i];
-        if (cur == "L" && type == "1") types[i] = "L";
-        else if (isStrong.test(type)) cur = type;
-      }
-
-      // N1. A sequence of neutrals takes the direction of the
-      // surrounding strong text if the text on both sides has the same
-      // direction. European and Arabic numbers act as if they were R in
-      // terms of their influence on neutrals. Start-of-level-run (sor)
-      // and end-of-level-run (eor) are used at level run boundaries.
-      // N2. Any remaining neutrals take the embedding direction.
-      for (var i = 0; i < len; ++i) {
-        if (isNeutral.test(types[i])) {
-          for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
-          var before = (i ? types[i-1] : outerType) == "L";
-          var after = (end < len ? types[end] : outerType) == "L";
-          var replace = before || after ? "L" : "R";
-          for (var j = i; j < end; ++j) types[j] = replace;
-          i = end - 1;
-        }
-      }
-
-      // Here we depart from the documented algorithm, in order to avoid
-      // building up an actual levels array. Since there are only three
-      // levels (0, 1, 2) in an implementation that doesn't take
-      // explicit embedding into account, we can build up the order on
-      // the fly, without following the level-based algorithm.
-      var order = [], m;
-      for (var i = 0; i < len;) {
-        if (countsAsLeft.test(types[i])) {
-          var start = i;
-          for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
-          order.push(new BidiSpan(0, start, i));
-        } else {
-          var pos = i, at = order.length;
-          for (++i; i < len && types[i] != "L"; ++i) {}
-          for (var j = pos; j < i;) {
-            if (countsAsNum.test(types[j])) {
-              if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j));
-              var nstart = j;
-              for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
-              order.splice(at, 0, new BidiSpan(2, nstart, j));
-              pos = j;
-            } else ++j;
-          }
-          if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i));
-        }
-      }
-      if (order[0].level == 1 && (m = str.match(/^\s+/))) {
-        order[0].from = m[0].length;
-        order.unshift(new BidiSpan(0, 0, m[0].length));
-      }
-      if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
-        lst(order).to -= m[0].length;
-        order.push(new BidiSpan(0, len - m[0].length, len));
-      }
-      if (order[0].level == 2)
-        order.unshift(new BidiSpan(1, order[0].to, order[0].to));
-      if (order[0].level != lst(order).level)
-        order.push(new BidiSpan(order[0].level, len, len));
-
-      return order;
-    };
-  })();
-
-  // THE END
-
-  CodeMirror.version = "5.17.0";
-
-  return CodeMirror;
-});

+ 0 - 271
web/staticres/codemirror/docs.css

@@ -1,271 +0,0 @@
-@font-face {
-  font-family: 'Source Sans Pro';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(//themes.googleusercontent.com/static/fonts/sourcesanspro/v5/ODelI1aHBYDBqgeIAH2zlBM0YzuT7MdOe03otPbuUS0.woff) format('woff');
-}
-
-body, html { margin: 0; padding: 0; height: 100%; }
-section, article { display: block; padding: 0; }
-
-body {
-  background: #f8f8f8;
-  font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-}
-
-p { margin-top: 0; }
-
-h2, h3, h1 {
-  font-weight: normal;
-  margin-bottom: .7em;
-}
-h1 { font-size: 140%; }
-h2 { font-size: 120%; }
-h3 { font-size: 110%; }
-article > h2:first-child, section:first-child > h2 { margin-top: 0; }
-
-#nav h1 {
-  margin-right: 12px;
-  margin-top: 0;
-  margin-bottom: 2px;
-  color: #d30707;
-  letter-spacing: .5px;
-}
-
-a, a:visited, a:link, .quasilink {
-  color: #A21313;
-  text-decoration: none;
-}
-
-em {
-  padding-right: 2px;
-}
-
-.quasilink {
-  cursor: pointer;
-}
-
-article {
-  max-width: 700px;
-  margin: 0 0 0 160px;
-  border-left: 2px solid #E30808;
-  border-right: 1px solid #ddd;
-  padding: 30px 50px 100px 50px;
-  background: white;
-  z-index: 2;
-  position: relative;
-  min-height: 100%;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
-
-#nav {
-  position: fixed;
-  padding-top: 30px;
-  max-height: 100%;
-  box-sizing: -moz-border-box;
-  box-sizing: border-box;
-  overflow-y: auto;
-  left: 0; right: none;
-  width: 160px;
-  text-align: right;
-  z-index: 1;
-}
-
-@media screen and (min-width: 1000px) {
-  article {
-    margin: 0 auto;
-  }
-  #nav {
-    right: 50%;
-    width: auto;
-    border-right: 349px solid transparent;
-  }
-}
-
-#nav ul {
-  display: block;
-  margin: 0; padding: 0;
-  margin-bottom: 32px;
-}
-
-#nav li {
-  display: block;
-  margin-bottom: 4px;
-}
-
-#nav li ul {
-  font-size: 80%;
-  margin-bottom: 0;
-  display: none;
-}
-
-#nav li.active ul {
-  display: block;
-}
-
-#nav li li a {
-  padding-right: 20px;
-  display: inline-block;
-}
-
-#nav ul a {
-  color: black;
-  padding: 0 7px 1px 11px;
-}
-
-#nav ul a.active, #nav ul a:hover {
-  border-bottom: 1px solid #E30808;
-  margin-bottom: -1px;
-  color: #E30808;
-}
-
-#logo {
-  border: 0;
-  margin-right: 12px;
-  margin-bottom: 25px;
-}
-
-section {
-  border-top: 1px solid #E30808;
-  margin: 1.5em 0;
-}
-
-section.first {
-  border: none;
-  margin-top: 0;
-}
-
-#demo {
-  position: relative;
-}
-
-#demolist {
-  position: absolute;
-  right: 5px;
-  top: 5px;
-  z-index: 25;
-}
-
-.yinyang {
-  position: absolute;
-  top: -10px;
-  left: 0; right: 0;
-  margin: auto;
-  display: block;
-  height: 120px;
-}
-
-.actions {
-  margin: 1em 0 0;
-  min-height: 100px;
-  position: relative;
-}
-
-.actionspicture {
-  pointer-events: none;
-  position: absolute;
-  height: 100px;
-  top: 0; left: 0; right: 0;
-}
-
-.actionlink {
-  pointer-events: auto;
-  font-family: arial;
-  font-size: 80%;
-  font-weight: bold;
-  position: absolute;
-  top: 0; bottom: 0;
-  line-height: 1;
-  height: 1em;
-  margin: auto;
-}
-
-.actionlink.download {
-  color: white;
-  right: 50%;
-  margin-right: 13px;
-  text-shadow: -1px 1px 3px #b00, -1px -1px 3px #b00, 1px 0px 3px #b00;
-}
-
-.actionlink.fund {
-  color: #b00;
-  left: 50%;
-  margin-left: 15px;
-}
-
-.actionlink:hover {
-  text-decoration: underline;
-}
-
-.actionlink a {
-  color: inherit;
-}
-
-.actionsleft {
-  float: left;
-}
-
-.actionsright {
-  float: right;
-  text-align: right;
-}
-
-@media screen and (max-width: 800px) {
-  .actions {
-    padding-top: 120px;
-  }
-  .actionsleft, .actionsright {
-    float: none;
-    text-align: left;
-    margin-bottom: 1em;
-  }
-}
-
-th {
-  text-decoration: underline;
-  font-weight: normal;
-  text-align: left;
-}
-
-#features ul {
-  list-style: none;
-  margin: 0 0 1em;
-  padding: 0 0 0 1.2em;
-}
-
-#features li:before {
-  content: "-";
-  width: 1em;
-  display: inline-block;
-  padding: 0;
-  margin: 0;
-  margin-left: -1em;
-}
-
-.rel {
-  margin-bottom: 0;
-}
-.rel-note {
-  margin-top: 0;
-  color: #555;
-}
-
-pre {
-  padding-left: 15px;
-  border-left: 2px solid #ddd;
-}
-
-code {
-  padding: 0 2px;
-}
-
-strong {
-  text-decoration: underline;
-  font-weight: normal;
-}
-
-.field {
-  border: 1px solid #A21313;
-}

+ 0 - 41
web/staticres/codemirror/fullscreen.js

@@ -1,41 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineOption("fullScreen", false, function(cm, val, old) {
-    if (old == CodeMirror.Init) old = false;
-    if (!old == !val) return;
-    if (val) setFullscreen(cm);
-    else setNormal(cm);
-  });
-
-  function setFullscreen(cm) {
-    var wrap = cm.getWrapperElement();
-    cm.state.fullScreenRestore = {scrollTop: window.pageYOffset, scrollLeft: window.pageXOffset,
-                                  width: wrap.style.width, height: wrap.style.height};
-    wrap.style.width = "";
-    wrap.style.height = "auto";
-    wrap.className += " CodeMirror-fullscreen";
-    document.documentElement.style.overflow = "hidden";
-    cm.refresh();
-  }
-
-  function setNormal(cm) {
-    var wrap = cm.getWrapperElement();
-    wrap.className = wrap.className.replace(/\s*CodeMirror-fullscreen\b/, "");
-    document.documentElement.style.overflow = "";
-    var info = cm.state.fullScreenRestore;
-    wrap.style.width = info.width; wrap.style.height = info.height;
-    window.scrollTo(info.scrollLeft, info.scrollTop);
-    cm.refresh();
-  }
-});

+ 0 - 146
web/staticres/codemirror/javascript-hint.js

@@ -1,146 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  var Pos = CodeMirror.Pos;
-
-  function forEach(arr, f) {
-    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
-  }
-
-  function arrayContains(arr, item) {
-    if (!Array.prototype.indexOf) {
-      var i = arr.length;
-      while (i--) {
-        if (arr[i] === item) {
-          return true;
-        }
-      }
-      return false;
-    }
-    return arr.indexOf(item) != -1;
-  }
-
-  function scriptHint(editor, keywords, getToken, options) {
-    // Find the token at the cursor
-    var cur = editor.getCursor(), token = getToken(editor, cur);
-    if (/\b(?:string|comment)\b/.test(token.type)) return;
-    token.state = CodeMirror.innerMode(editor.getMode(), token.state).state;
-
-    // If it's not a 'word-style' token, ignore the token.
-    if (!/^[\w$_]*$/.test(token.string)) {
-      token = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-               type: token.string == "." ? "property" : null};
-    } else if (token.end > cur.ch) {
-      token.end = cur.ch;
-      token.string = token.string.slice(0, cur.ch - token.start);
-    }
-
-    var tprop = token;
-    // If it is a property, find out what it is a property of.
-    while (tprop.type == "property") {
-      tprop = getToken(editor, Pos(cur.line, tprop.start));
-      if (tprop.string != ".") return;
-      tprop = getToken(editor, Pos(cur.line, tprop.start));
-      if (!context) var context = [];
-      context.push(tprop);
-    }
-    return {list: getCompletions(token, context, keywords, options),
-            from: Pos(cur.line, token.start),
-            to: Pos(cur.line, token.end)};
-  }
-
-  function javascriptHint(editor, options) {
-    return scriptHint(editor, javascriptKeywords,
-                      function (e, cur) {return e.getTokenAt(cur);},
-                      options);
-  };
-  CodeMirror.registerHelper("hint", "javascript", javascriptHint);
-
-  function getCoffeeScriptToken(editor, cur) {
-  // This getToken, it is for coffeescript, imitates the behavior of
-  // getTokenAt method in javascript.js, that is, returning "property"
-  // type and treat "." as indepenent token.
-    var token = editor.getTokenAt(cur);
-    if (cur.ch == token.start + 1 && token.string.charAt(0) == '.') {
-      token.end = token.start;
-      token.string = '.';
-      token.type = "property";
-    }
-    else if (/^\.[\w$_]*$/.test(token.string)) {
-      token.type = "property";
-      token.start++;
-      token.string = token.string.replace(/\./, '');
-    }
-    return token;
-  }
-
-  function coffeescriptHint(editor, options) {
-    return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken, options);
-  }
-  CodeMirror.registerHelper("hint", "coffeescript", coffeescriptHint);
-
-  var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
-                     "toUpperCase toLowerCase split concat match replace search").split(" ");
-  var arrayProps = ("length concat join splice push pop shift unshift slice reverse sort indexOf " +
-                    "lastIndexOf every some filter forEach map reduce reduceRight ").split(" ");
-  var funcProps = "prototype apply call bind".split(" ");
-  var javascriptKeywords = ("break case catch continue debugger default delete do else false finally for function " +
-                  "if in instanceof new null return switch throw true try typeof var void while with").split(" ");
-  var coffeescriptKeywords = ("and break catch class continue delete do else extends false finally for " +
-                  "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
-
-  function getCompletions(token, context, keywords, options) {
-    var found = [], start = token.string, global = options && options.globalScope || window;
-    function maybeAdd(str) {
-      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
-    }
-    function gatherCompletions(obj) {
-      if (typeof obj == "string") forEach(stringProps, maybeAdd);
-      else if (obj instanceof Array) forEach(arrayProps, maybeAdd);
-      else if (obj instanceof Function) forEach(funcProps, maybeAdd);
-      for (var name in obj) maybeAdd(name);
-    }
-
-    if (context && context.length) {
-      // If this is a property, see if it belongs to some object we can
-      // find in the current environment.
-      var obj = context.pop(), base;
-      if (obj.type && obj.type.indexOf("variable") === 0) {
-        if (options && options.additionalContext)
-          base = options.additionalContext[obj.string];
-        if (!options || options.useGlobalScope !== false)
-          base = base || global[obj.string];
-      } else if (obj.type == "string") {
-        base = "";
-      } else if (obj.type == "atom") {
-        base = 1;
-      } else if (obj.type == "function") {
-        if (global.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
-            (typeof global.jQuery == 'function'))
-          base = global.jQuery();
-        else if (global._ != null && (obj.string == '_') && (typeof global._ == 'function'))
-          base = global._();
-      }
-      while (base != null && context.length)
-        base = base[context.pop().string];
-      if (base != null) gatherCompletions(base);
-    } else {
-      // If not, just look in the global object and any local scope
-      // (reading into JS mode internals to get at the local and global variables)
-      for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
-      for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
-      if (!options || options.useGlobalScope !== false)
-        gatherCompletions(global);
-      forEach(keywords, maybeAdd);
-    }
-    return found;
-  }
-});

+ 0 - 743
web/staticres/codemirror/javascript.js

@@ -1,743 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// TODO actually recognize syntax of TypeScript constructs
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-function expressionAllowed(stream, state, backUp) {
-  return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
-    (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
-}
-
-CodeMirror.defineMode("javascript", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var statementIndent = parserConfig.statementIndent;
-  var jsonldMode = parserConfig.jsonld;
-  var jsonMode = parserConfig.json || jsonldMode;
-  var isTS = parserConfig.typescript;
-  var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
-
-  // Tokenizer
-
-  var keywords = function(){
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
-    var operator = kw("operator"), atom = {type: "atom", style: "atom"};
-
-    var jsKeywords = {
-      "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "throw": C, "debugger": C,
-      "var": kw("var"), "const": kw("var"), "let": kw("var"),
-      "function": kw("function"), "catch": kw("catch"),
-      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "typeof": operator, "instanceof": operator,
-      "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
-      "this": kw("this"), "class": kw("class"), "super": kw("atom"),
-      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C,
-      "await": C, "async": kw("async")
-    };
-
-    // Extend the 'normal' keywords with the TypeScript language extensions
-    if (isTS) {
-      var type = {type: "variable", style: "variable-3"};
-      var tsKeywords = {
-        // object-like things
-        "interface": kw("class"),
-        "implements": C,
-        "namespace": C,
-        "module": kw("module"),
-        "enum": kw("module"),
-
-        // scope modifiers
-        "public": kw("modifier"),
-        "private": kw("modifier"),
-        "protected": kw("modifier"),
-        "abstract": kw("modifier"),
-
-        // operators
-        "as": operator,
-
-        // types
-        "string": type, "number": type, "boolean": type, "any": type
-      };
-
-      for (var attr in tsKeywords) {
-        jsKeywords[attr] = tsKeywords[attr];
-      }
-    }
-
-    return jsKeywords;
-  }();
-
-  var isOperatorChar = /[+\-*&%=<>!?|~^]/;
-  var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;
-
-  function readRegexp(stream) {
-    var escaped = false, next, inSet = false;
-    while ((next = stream.next()) != null) {
-      if (!escaped) {
-        if (next == "/" && !inSet) return;
-        if (next == "[") inSet = true;
-        else if (inSet && next == "]") inSet = false;
-      }
-      escaped = !escaped && next == "\\";
-    }
-  }
-
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-  function ret(tp, style, cont) {
-    type = tp; content = cont;
-    return style;
-  }
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
-      return ret("number", "number");
-    } else if (ch == "." && stream.match("..")) {
-      return ret("spread", "meta");
-    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      return ret(ch);
-    } else if (ch == "=" && stream.eat(">")) {
-      return ret("=>", "operator");
-    } else if (ch == "0" && stream.eat(/x/i)) {
-      stream.eatWhile(/[\da-f]/i);
-      return ret("number", "number");
-    } else if (ch == "0" && stream.eat(/o/i)) {
-      stream.eatWhile(/[0-7]/i);
-      return ret("number", "number");
-    } else if (ch == "0" && stream.eat(/b/i)) {
-      stream.eatWhile(/[01]/i);
-      return ret("number", "number");
-    } else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
-      return ret("number", "number");
-    } else if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      } else if (stream.eat("/")) {
-        stream.skipToEnd();
-        return ret("comment", "comment");
-      } else if (expressionAllowed(stream, state, 1)) {
-        readRegexp(stream);
-        stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
-        return ret("regexp", "string-2");
-      } else {
-        stream.eatWhile(isOperatorChar);
-        return ret("operator", "operator", stream.current());
-      }
-    } else if (ch == "`") {
-      state.tokenize = tokenQuasi;
-      return tokenQuasi(stream, state);
-    } else if (ch == "#") {
-      stream.skipToEnd();
-      return ret("error", "error");
-    } else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return ret("operator", "operator", stream.current());
-    } else if (wordRE.test(ch)) {
-      stream.eatWhile(wordRE);
-      var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
-      return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
-                     ret("variable", "variable", word);
-    }
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next;
-      if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){
-        state.tokenize = tokenBase;
-        return ret("jsonld-keyword", "meta");
-      }
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) break;
-        escaped = !escaped && next == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenQuasi(stream, state) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      escaped = !escaped && next == "\\";
-    }
-    return ret("quasi", "string-2", stream.current());
-  }
-
-  var brackets = "([{}])";
-  // This is a crude lookahead trick to try and notice that we're
-  // parsing the argument patterns for a fat-arrow function before we
-  // actually hit the arrow token. It only works if the arrow is on
-  // the same line as the arguments and there's no strange noise
-  // (comments) in between. Fallback is to only notice when we hit the
-  // arrow, and not declare the arguments as locals for the arrow
-  // body.
-  function findFatArrow(stream, state) {
-    if (state.fatArrowAt) state.fatArrowAt = null;
-    var arrow = stream.string.indexOf("=>", stream.start);
-    if (arrow < 0) return;
-
-    var depth = 0, sawSomething = false;
-    for (var pos = arrow - 1; pos >= 0; --pos) {
-      var ch = stream.string.charAt(pos);
-      var bracket = brackets.indexOf(ch);
-      if (bracket >= 0 && bracket < 3) {
-        if (!depth) { ++pos; break; }
-        if (--depth == 0) break;
-      } else if (bracket >= 3 && bracket < 6) {
-        ++depth;
-      } else if (wordRE.test(ch)) {
-        sawSomething = true;
-      } else if (/["'\/]/.test(ch)) {
-        return;
-      } else if (sawSomething && !depth) {
-        ++pos;
-        break;
-      }
-    }
-    if (sawSomething && !depth) state.fatArrowAt = pos;
-  }
-
-  // Parser
-
-  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true};
-
-  function JSLexical(indented, column, type, align, prev, info) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.prev = prev;
-    this.info = info;
-    if (align != null) this.align = align;
-  }
-
-  function inScope(state, varname) {
-    for (var v = state.localVars; v; v = v.next)
-      if (v.name == varname) return true;
-    for (var cx = state.context; cx; cx = cx.prev) {
-      for (var v = cx.vars; v; v = v.next)
-        if (v.name == varname) return true;
-    }
-  }
-
-  function parseJS(state, style, type, content, stream) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style;
-
-    if (!state.lexical.hasOwnProperty("align"))
-      state.lexical.align = true;
-
-    while(true) {
-      var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement;
-      if (combinator(type, content)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        if (cx.marked) return cx.marked;
-        if (type == "variable" && inScope(state, content)) return "variable-2";
-        return style;
-      }
-    }
-  }
-
-  // Combinator utils
-
-  var cx = {state: null, column: null, marked: null, cc: null};
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-  function register(varname) {
-    function inList(list) {
-      for (var v = list; v; v = v.next)
-        if (v.name == varname) return true;
-      return false;
-    }
-    var state = cx.state;
-    cx.marked = "def";
-    if (state.context) {
-      if (inList(state.localVars)) return;
-      state.localVars = {name: varname, next: state.localVars};
-    } else {
-      if (inList(state.globalVars)) return;
-      if (parserConfig.globalVars)
-        state.globalVars = {name: varname, next: state.globalVars};
-    }
-  }
-
-  // Combinators
-
-  var defaultVars = {name: "this", next: {name: "arguments"}};
-  function pushcontext() {
-    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
-    cx.state.localVars = defaultVars;
-  }
-  function popcontext() {
-    cx.state.localVars = cx.state.context.vars;
-    cx.state.context = cx.state.context.prev;
-  }
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state, indent = state.indented;
-      if (state.lexical.type == "stat") indent = state.lexical.indented;
-      else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev)
-        indent = outer.indented;
-      state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  poplex.lex = true;
-
-  function expect(wanted) {
-    function exp(type) {
-      if (type == wanted) return cont();
-      else if (wanted == ";") return pass();
-      else return cont(exp);
-    };
-    return exp;
-  }
-
-  function statement(type, value) {
-    if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
-    if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
-    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    if (type == ";") return cont();
-    if (type == "if") {
-      if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
-        cx.state.cc.pop()();
-      return cont(pushlex("form"), expression, statement, poplex, maybeelse);
-    }
-    if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
-    if (type == "variable") return cont(pushlex("stat"), maybelabel);
-    if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
-                                      block, poplex, poplex);
-    if (type == "case") return cont(expression, expect(":"));
-    if (type == "default") return cont(expect(":"));
-    if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                     statement, poplex, popcontext);
-    if (type == "class") return cont(pushlex("form"), className, poplex);
-    if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
-    if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
-    if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
-    if (type == "async") return cont(statement)
-    return pass(pushlex("stat"), expression, expect(";"), poplex);
-  }
-  function expression(type) {
-    return expressionInner(type, false);
-  }
-  function expressionNoComma(type) {
-    return expressionInner(type, true);
-  }
-  function expressionInner(type, noComma) {
-    if (cx.state.fatArrowAt == cx.stream.start) {
-      var body = noComma ? arrowBodyNoComma : arrowBody;
-      if (type == "(") return cont(pushcontext, pushlex(")"), commasep(pattern, ")"), poplex, expect("=>"), body, popcontext);
-      else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
-    }
-
-    var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
-    if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
-    if (type == "function") return cont(functiondef, maybeop);
-    if (type == "keyword c" || type == "async") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
-    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
-    if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
-    if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
-    if (type == "{") return contCommasep(objprop, "}", null, maybeop);
-    if (type == "quasi") return pass(quasi, maybeop);
-    if (type == "new") return cont(maybeTarget(noComma));
-    return cont();
-  }
-  function maybeexpression(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expression);
-  }
-  function maybeexpressionNoComma(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expressionNoComma);
-  }
-
-  function maybeoperatorComma(type, value) {
-    if (type == ",") return cont(expression);
-    return maybeoperatorNoComma(type, value, false);
-  }
-  function maybeoperatorNoComma(type, value, noComma) {
-    var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
-    var expr = noComma == false ? expression : expressionNoComma;
-    if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
-    if (type == "operator") {
-      if (/\+\+|--/.test(value)) return cont(me);
-      if (value == "?") return cont(expression, expect(":"), expr);
-      return cont(expr);
-    }
-    if (type == "quasi") { return pass(quasi, me); }
-    if (type == ";") return;
-    if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
-    if (type == ".") return cont(property, me);
-    if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
-  }
-  function quasi(type, value) {
-    if (type != "quasi") return pass();
-    if (value.slice(value.length - 2) != "${") return cont(quasi);
-    return cont(expression, continueQuasi);
-  }
-  function continueQuasi(type) {
-    if (type == "}") {
-      cx.marked = "string-2";
-      cx.state.tokenize = tokenQuasi;
-      return cont(quasi);
-    }
-  }
-  function arrowBody(type) {
-    findFatArrow(cx.stream, cx.state);
-    return pass(type == "{" ? statement : expression);
-  }
-  function arrowBodyNoComma(type) {
-    findFatArrow(cx.stream, cx.state);
-    return pass(type == "{" ? statement : expressionNoComma);
-  }
-  function maybeTarget(noComma) {
-    return function(type) {
-      if (type == ".") return cont(noComma ? targetNoComma : target);
-      else return pass(noComma ? expressionNoComma : expression);
-    };
-  }
-  function target(_, value) {
-    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorComma); }
-  }
-  function targetNoComma(_, value) {
-    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorNoComma); }
-  }
-  function maybelabel(type) {
-    if (type == ":") return cont(poplex, statement);
-    return pass(maybeoperatorComma, expect(";"), poplex);
-  }
-  function property(type) {
-    if (type == "variable") {cx.marked = "property"; return cont();}
-  }
-  function objprop(type, value) {
-    if (type == "async") return cont(objprop);
-    if (type == "variable" || cx.style == "keyword") {
-      cx.marked = "property";
-      if (value == "get" || value == "set") return cont(getterSetter);
-      return cont(afterprop);
-    } else if (type == "number" || type == "string") {
-      cx.marked = jsonldMode ? "property" : (cx.style + " property");
-      return cont(afterprop);
-    } else if (type == "jsonld-keyword") {
-      return cont(afterprop);
-    } else if (type == "modifier") {
-      return cont(objprop)
-    } else if (type == "[") {
-      return cont(expression, expect("]"), afterprop);
-    } else if (type == "spread") {
-      return cont(expression);
-    }
-  }
-  function getterSetter(type) {
-    if (type != "variable") return pass(afterprop);
-    cx.marked = "property";
-    return cont(functiondef);
-  }
-  function afterprop(type) {
-    if (type == ":") return cont(expressionNoComma);
-    if (type == "(") return pass(functiondef);
-  }
-  function commasep(what, end) {
-    function proceed(type, value) {
-      if (type == ",") {
-        var lex = cx.state.lexical;
-        if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
-        return cont(function(type, value) {
-          if (type == end || value == end) return pass()
-          return pass(what)
-        }, proceed);
-      }
-      if (type == end || value == end) return cont();
-      return cont(expect(end));
-    }
-    return function(type, value) {
-      if (type == end || value == end) return cont();
-      return pass(what, proceed);
-    };
-  }
-  function contCommasep(what, end, info) {
-    for (var i = 3; i < arguments.length; i++)
-      cx.cc.push(arguments[i]);
-    return cont(pushlex(end, info), commasep(what, end), poplex);
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    return pass(statement, block);
-  }
-  function maybetype(type) {
-    if (isTS && type == ":") return cont(typeexpr);
-  }
-  function maybedefault(_, value) {
-    if (value == "=") return cont(expressionNoComma);
-  }
-  function typeexpr(type) {
-    if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
-  }
-  function afterType(type, value) {
-    if (value == "<") return cont(commasep(typeexpr, ">"), afterType)
-    if (type == "[") return cont(expect("]"), afterType)
-  }
-  function vardef() {
-    return pass(pattern, maybetype, maybeAssign, vardefCont);
-  }
-  function pattern(type, value) {
-    if (type == "modifier") return cont(pattern)
-    if (type == "variable") { register(value); return cont(); }
-    if (type == "spread") return cont(pattern);
-    if (type == "[") return contCommasep(pattern, "]");
-    if (type == "{") return contCommasep(proppattern, "}");
-  }
-  function proppattern(type, value) {
-    if (type == "variable" && !cx.stream.match(/^\s*:/, false)) {
-      register(value);
-      return cont(maybeAssign);
-    }
-    if (type == "variable") cx.marked = "property";
-    if (type == "spread") return cont(pattern);
-    if (type == "}") return pass();
-    return cont(expect(":"), pattern, maybeAssign);
-  }
-  function maybeAssign(_type, value) {
-    if (value == "=") return cont(expressionNoComma);
-  }
-  function vardefCont(type) {
-    if (type == ",") return cont(vardef);
-  }
-  function maybeelse(type, value) {
-    if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
-  }
-  function forspec(type) {
-    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
-  }
-  function forspec1(type) {
-    if (type == "var") return cont(vardef, expect(";"), forspec2);
-    if (type == ";") return cont(forspec2);
-    if (type == "variable") return cont(formaybeinof);
-    return pass(expression, expect(";"), forspec2);
-  }
-  function formaybeinof(_type, value) {
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return cont(maybeoperatorComma, forspec2);
-  }
-  function forspec2(type, value) {
-    if (type == ";") return cont(forspec3);
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return pass(expression, expect(";"), forspec3);
-  }
-  function forspec3(type) {
-    if (type != ")") cont(expression);
-  }
-  function functiondef(type, value) {
-    if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
-    if (type == "variable") {register(value); return cont(functiondef);}
-    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, maybetype, statement, popcontext);
-  }
-  function funarg(type) {
-    if (type == "spread") return cont(funarg);
-    return pass(pattern, maybetype, maybedefault);
-  }
-  function className(type, value) {
-    if (type == "variable") {register(value); return cont(classNameAfter);}
-  }
-  function classNameAfter(type, value) {
-    if (value == "extends") return cont(expression, classNameAfter);
-    if (type == "{") return cont(pushlex("}"), classBody, poplex);
-  }
-  function classBody(type, value) {
-    if (type == "variable" || cx.style == "keyword") {
-      if (value == "static") {
-        cx.marked = "keyword";
-        return cont(classBody);
-      }
-      cx.marked = "property";
-      if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody);
-      return cont(functiondef, classBody);
-    }
-    if (value == "*") {
-      cx.marked = "keyword";
-      return cont(classBody);
-    }
-    if (type == ";") return cont(classBody);
-    if (type == "}") return cont();
-  }
-  function classGetterSetter(type) {
-    if (type != "variable") return pass();
-    cx.marked = "property";
-    return cont();
-  }
-  function afterExport(_type, value) {
-    if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
-    if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
-    return pass(statement);
-  }
-  function afterImport(type) {
-    if (type == "string") return cont();
-    return pass(importSpec, maybeFrom);
-  }
-  function importSpec(type, value) {
-    if (type == "{") return contCommasep(importSpec, "}");
-    if (type == "variable") register(value);
-    if (value == "*") cx.marked = "keyword";
-    return cont(maybeAs);
-  }
-  function maybeAs(_type, value) {
-    if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
-  }
-  function maybeFrom(_type, value) {
-    if (value == "from") { cx.marked = "keyword"; return cont(expression); }
-  }
-  function arrayLiteral(type) {
-    if (type == "]") return cont();
-    return pass(expressionNoComma, commasep(expressionNoComma, "]"));
-  }
-
-  function isContinuedStatement(state, textAfter) {
-    return state.lastType == "operator" || state.lastType == "," ||
-      isOperatorChar.test(textAfter.charAt(0)) ||
-      /[,.]/.test(textAfter.charAt(0));
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      var state = {
-        tokenize: tokenBase,
-        lastType: "sof",
-        cc: [],
-        lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
-        localVars: parserConfig.localVars,
-        context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: basecolumn || 0
-      };
-      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
-        state.globalVars = parserConfig.globalVars;
-      return state;
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-        findFatArrow(stream, state);
-      }
-      if (state.tokenize != tokenComment && stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (type == "comment") return style;
-      state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type;
-      return parseJS(state, style, type, content, stream);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize == tokenComment) return CodeMirror.Pass;
-      if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
-      // Kludge to prevent 'maybelse' from blocking lexical scope pops
-      if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) {
-        var c = state.cc[i];
-        if (c == poplex) lexical = lexical.prev;
-        else if (c != maybeelse) break;
-      }
-      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
-      if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
-        lexical = lexical.prev;
-      var type = lexical.type, closing = firstChar == type;
-
-      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
-      else if (type == "form" && firstChar == "{") return lexical.indented;
-      else if (type == "form") return lexical.indented + indentUnit;
-      else if (type == "stat")
-        return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);
-      else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
-        return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
-      else if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      else return lexical.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
-    blockCommentStart: jsonMode ? null : "/*",
-    blockCommentEnd: jsonMode ? null : "*/",
-    lineComment: jsonMode ? null : "//",
-    fold: "brace",
-    closeBrackets: "()[]{}''\"\"``",
-
-    helperType: jsonMode ? "json" : "javascript",
-    jsonldMode: jsonldMode,
-    jsonMode: jsonMode,
-
-    expressionAllowed: expressionAllowed,
-    skipExpression: function(state) {
-      var top = state.cc[state.cc.length - 1]
-      if (top == expression || top == expressionNoComma) state.cc.pop()
-    }
-  };
-});
-
-CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/);
-
-CodeMirror.defineMIME("text/javascript", "javascript");
-CodeMirror.defineMIME("text/ecmascript", "javascript");
-CodeMirror.defineMIME("application/javascript", "javascript");
-CodeMirror.defineMIME("application/x-javascript", "javascript");
-CodeMirror.defineMIME("application/ecmascript", "javascript");
-CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/ld+json", {name: "javascript", jsonld: true});
-CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
-CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
-
-});

+ 0 - 159
web/staticres/codemirror/lua.js

@@ -1,159 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's
-// CodeMirror 1 mode.
-// highlights keywords, strings, comments (no leveling supported! ("[==[")), tokens, basic indenting
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("lua", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-
-  function prefixRE(words) {
-    return new RegExp("^(?:" + words.join("|") + ")", "i");
-  }
-  function wordRE(words) {
-    return new RegExp("^(?:" + words.join("|") + ")$", "i");
-  }
-  var specials = wordRE(parserConfig.specials || []);
-
-  // long list of standard functions from lua manual
-  var builtins = wordRE([
-    "_G","_VERSION","assert","collectgarbage","dofile","error","getfenv","getmetatable","ipairs","load",
-    "loadfile","loadstring","module","next","pairs","pcall","print","rawequal","rawget","rawset","require",
-    "select","setfenv","setmetatable","tonumber","tostring","type","unpack","xpcall",
-
-    "coroutine.create","coroutine.resume","coroutine.running","coroutine.status","coroutine.wrap","coroutine.yield",
-
-    "debug.debug","debug.getfenv","debug.gethook","debug.getinfo","debug.getlocal","debug.getmetatable",
-    "debug.getregistry","debug.getupvalue","debug.setfenv","debug.sethook","debug.setlocal","debug.setmetatable",
-    "debug.setupvalue","debug.traceback",
-
-    "close","flush","lines","read","seek","setvbuf","write",
-
-    "io.close","io.flush","io.input","io.lines","io.open","io.output","io.popen","io.read","io.stderr","io.stdin",
-    "io.stdout","io.tmpfile","io.type","io.write",
-
-    "math.abs","math.acos","math.asin","math.atan","math.atan2","math.ceil","math.cos","math.cosh","math.deg",
-    "math.exp","math.floor","math.fmod","math.frexp","math.huge","math.ldexp","math.log","math.log10","math.max",
-    "math.min","math.modf","math.pi","math.pow","math.rad","math.random","math.randomseed","math.sin","math.sinh",
-    "math.sqrt","math.tan","math.tanh",
-
-    "os.clock","os.date","os.difftime","os.execute","os.exit","os.getenv","os.remove","os.rename","os.setlocale",
-    "os.time","os.tmpname",
-
-    "package.cpath","package.loaded","package.loaders","package.loadlib","package.path","package.preload",
-    "package.seeall",
-
-    "string.byte","string.char","string.dump","string.find","string.format","string.gmatch","string.gsub",
-    "string.len","string.lower","string.match","string.rep","string.reverse","string.sub","string.upper",
-
-    "table.concat","table.insert","table.maxn","table.remove","table.sort"
-  ]);
-  var keywords = wordRE(["and","break","elseif","false","nil","not","or","return",
-                         "true","function", "end", "if", "then", "else", "do",
-                         "while", "repeat", "until", "for", "in", "local" ]);
-
-  var indentTokens = wordRE(["function", "if","repeat","do", "\\(", "{"]);
-  var dedentTokens = wordRE(["end", "until", "\\)", "}"]);
-  var dedentPartial = prefixRE(["end", "until", "\\)", "}", "else", "elseif"]);
-
-  function readBracket(stream) {
-    var level = 0;
-    while (stream.eat("=")) ++level;
-    stream.eat("[");
-    return level;
-  }
-
-  function normal(stream, state) {
-    var ch = stream.next();
-    if (ch == "-" && stream.eat("-")) {
-      if (stream.eat("[") && stream.eat("["))
-        return (state.cur = bracketed(readBracket(stream), "comment"))(stream, state);
-      stream.skipToEnd();
-      return "comment";
-    }
-    if (ch == "\"" || ch == "'")
-      return (state.cur = string(ch))(stream, state);
-    if (ch == "[" && /[\[=]/.test(stream.peek()))
-      return (state.cur = bracketed(readBracket(stream), "string"))(stream, state);
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w.%]/);
-      return "number";
-    }
-    if (/[\w_]/.test(ch)) {
-      stream.eatWhile(/[\w\\\-_.]/);
-      return "variable";
-    }
-    return null;
-  }
-
-  function bracketed(level, style) {
-    return function(stream, state) {
-      var curlev = null, ch;
-      while ((ch = stream.next()) != null) {
-        if (curlev == null) {if (ch == "]") curlev = 0;}
-        else if (ch == "=") ++curlev;
-        else if (ch == "]" && curlev == level) { state.cur = normal; break; }
-        else curlev = null;
-      }
-      return style;
-    };
-  }
-
-  function string(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) state.cur = normal;
-      return "string";
-    };
-  }
-
-  return {
-    startState: function(basecol) {
-      return {basecol: basecol || 0, indentDepth: 0, cur: normal};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.cur(stream, state);
-      var word = stream.current();
-      if (style == "variable") {
-        if (keywords.test(word)) style = "keyword";
-        else if (builtins.test(word)) style = "builtin";
-        else if (specials.test(word)) style = "variable-2";
-      }
-      if ((style != "comment") && (style != "string")){
-        if (indentTokens.test(word)) ++state.indentDepth;
-        else if (dedentTokens.test(word)) --state.indentDepth;
-      }
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var closing = dedentPartial.test(textAfter);
-      return state.basecol + indentUnit * (state.indentDepth - (closing ? 1 : 0));
-    },
-
-    lineComment: "--",
-    blockCommentStart: "--[[",
-    blockCommentEnd: "]]"
-  };
-});
-
-CodeMirror.defineMIME("text/x-lua", "lua");
-
-});

+ 0 - 36
web/staticres/codemirror/show-hint.css

@@ -1,36 +0,0 @@
-.CodeMirror-hints {
-  position: absolute;
-  z-index: 10;
-  overflow: hidden;
-  list-style: none;
-
-  margin: 0;
-  padding: 2px;
-
-  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  border-radius: 3px;
-  border: 1px solid silver;
-
-  background: white;
-  font-size: 90%;
-  font-family: monospace;
-
-  max-height: 20em;
-  overflow-y: auto;
-}
-
-.CodeMirror-hint {
-  margin: 0;
-  padding: 0 4px;
-  border-radius: 2px;
-  white-space: pre;
-  color: black;
-  cursor: pointer;
-}
-
-li.CodeMirror-hint-active {
-  background: #08f;
-  color: white;
-}

+ 0 - 438
web/staticres/codemirror/show-hint.js

@@ -1,438 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
-  var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
-
-  // This is the old interface, kept around for now to stay
-  // backwards-compatible.
-  CodeMirror.showHint = function(cm, getHints, options) {
-    if (!getHints) return cm.showHint(options);
-    if (options && options.async) getHints.async = true;
-    var newOpts = {hint: getHints};
-    if (options) for (var prop in options) newOpts[prop] = options[prop];
-    return cm.showHint(newOpts);
-  };
-
-  CodeMirror.defineExtension("showHint", function(options) {
-    options = parseOptions(this, this.getCursor("start"), options);
-    var selections = this.listSelections()
-    if (selections.length > 1) return;
-    // By default, don't allow completion when something is selected.
-    // A hint function can have a `supportsSelection` property to
-    // indicate that it can handle selections.
-    if (this.somethingSelected()) {
-      if (!options.hint.supportsSelection) return;
-      // Don't try with cross-line selections
-      for (var i = 0; i < selections.length; i++)
-        if (selections[i].head.line != selections[i].anchor.line) return;
-    }
-
-    if (this.state.completionActive) this.state.completionActive.close();
-    var completion = this.state.completionActive = new Completion(this, options);
-    if (!completion.options.hint) return;
-
-    CodeMirror.signal(this, "startCompletion", this);
-    completion.update(true);
-  });
-
-  function Completion(cm, options) {
-    this.cm = cm;
-    this.options = options;
-    this.widget = null;
-    this.debounce = 0;
-    this.tick = 0;
-    this.startPos = this.cm.getCursor("start");
-    this.startLen = this.cm.getLine(this.startPos.line).length - this.cm.getSelection().length;
-
-    var self = this;
-    cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
-  }
-
-  var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
-    return setTimeout(fn, 1000/60);
-  };
-  var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
-
-  Completion.prototype = {
-    close: function() {
-      if (!this.active()) return;
-      this.cm.state.completionActive = null;
-      this.tick = null;
-      this.cm.off("cursorActivity", this.activityFunc);
-
-      if (this.widget && this.data) CodeMirror.signal(this.data, "close");
-      if (this.widget) this.widget.close();
-      CodeMirror.signal(this.cm, "endCompletion", this.cm);
-    },
-
-    active: function() {
-      return this.cm.state.completionActive == this;
-    },
-
-    pick: function(data, i) {
-      var completion = data.list[i];
-      if (completion.hint) completion.hint(this.cm, data, completion);
-      else this.cm.replaceRange(getText(completion), completion.from || data.from,
-                                completion.to || data.to, "complete");
-      CodeMirror.signal(data, "pick", completion);
-      this.close();
-    },
-
-    cursorActivity: function() {
-      if (this.debounce) {
-        cancelAnimationFrame(this.debounce);
-        this.debounce = 0;
-      }
-
-      var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line);
-      if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
-          pos.ch < this.startPos.ch || this.cm.somethingSelected() ||
-          (pos.ch && this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
-        this.close();
-      } else {
-        var self = this;
-        this.debounce = requestAnimationFrame(function() {self.update();});
-        if (this.widget) this.widget.disable();
-      }
-    },
-
-    update: function(first) {
-      if (this.tick == null) return
-      var self = this, myTick = ++this.tick
-      fetchHints(this.options.hint, this.cm, this.options, function(data) {
-        if (self.tick == myTick) self.finishUpdate(data, first)
-      })
-    },
-
-    finishUpdate: function(data, first) {
-      if (this.data) CodeMirror.signal(this.data, "update");
-
-      var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
-      if (this.widget) this.widget.close();
-
-      if (data && this.data && isNewCompletion(this.data, data)) return;
-      this.data = data;
-
-      if (data && data.list.length) {
-        if (picked && data.list.length == 1) {
-          this.pick(data, 0);
-        } else {
-          this.widget = new Widget(this, data);
-          CodeMirror.signal(data, "shown");
-        }
-      }
-    }
-  };
-
-  function isNewCompletion(old, nw) {
-    var moved = CodeMirror.cmpPos(nw.from, old.from)
-    return moved > 0 && old.to.ch - old.from.ch != nw.to.ch - nw.from.ch
-  }
-
-  function parseOptions(cm, pos, options) {
-    var editor = cm.options.hintOptions;
-    var out = {};
-    for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
-    if (editor) for (var prop in editor)
-      if (editor[prop] !== undefined) out[prop] = editor[prop];
-    if (options) for (var prop in options)
-      if (options[prop] !== undefined) out[prop] = options[prop];
-    if (out.hint.resolve) out.hint = out.hint.resolve(cm, pos)
-    return out;
-  }
-
-  function getText(completion) {
-    if (typeof completion == "string") return completion;
-    else return completion.text;
-  }
-
-  function buildKeyMap(completion, handle) {
-    var baseMap = {
-      Up: function() {handle.moveFocus(-1);},
-      Down: function() {handle.moveFocus(1);},
-      PageUp: function() {handle.moveFocus(-handle.menuSize() + 1, true);},
-      PageDown: function() {handle.moveFocus(handle.menuSize() - 1, true);},
-      Home: function() {handle.setFocus(0);},
-      End: function() {handle.setFocus(handle.length - 1);},
-      Enter: handle.pick,
-      Tab: handle.pick,
-      Esc: handle.close
-    };
-    var custom = completion.options.customKeys;
-    var ourMap = custom ? {} : baseMap;
-    function addBinding(key, val) {
-      var bound;
-      if (typeof val != "string")
-        bound = function(cm) { return val(cm, handle); };
-      // This mechanism is deprecated
-      else if (baseMap.hasOwnProperty(val))
-        bound = baseMap[val];
-      else
-        bound = val;
-      ourMap[key] = bound;
-    }
-    if (custom)
-      for (var key in custom) if (custom.hasOwnProperty(key))
-        addBinding(key, custom[key]);
-    var extra = completion.options.extraKeys;
-    if (extra)
-      for (var key in extra) if (extra.hasOwnProperty(key))
-        addBinding(key, extra[key]);
-    return ourMap;
-  }
-
-  function getHintElement(hintsElement, el) {
-    while (el && el != hintsElement) {
-      if (el.nodeName.toUpperCase() === "LI" && el.parentNode == hintsElement) return el;
-      el = el.parentNode;
-    }
-  }
-
-  function Widget(completion, data) {
-    this.completion = completion;
-    this.data = data;
-    this.picked = false;
-    var widget = this, cm = completion.cm;
-
-    var hints = this.hints = document.createElement("ul");
-    hints.className = "CodeMirror-hints";
-    this.selectedHint = data.selectedHint || 0;
-
-    var completions = data.list;
-    for (var i = 0; i < completions.length; ++i) {
-      var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
-      var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
-      if (cur.className != null) className = cur.className + " " + className;
-      elt.className = className;
-      if (cur.render) cur.render(elt, data, cur);
-      else elt.appendChild(document.createTextNode(cur.displayText || getText(cur)));
-      elt.hintId = i;
-    }
-
-    var pos = cm.cursorCoords(completion.options.alignWithWord ? data.from : null);
-    var left = pos.left, top = pos.bottom, below = true;
-    hints.style.left = left + "px";
-    hints.style.top = top + "px";
-    // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
-    var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
-    var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
-    (completion.options.container || document.body).appendChild(hints);
-    var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
-    var scrolls = hints.scrollHeight > hints.clientHeight + 1
-    var startScroll = cm.getScrollInfo();
-
-    if (overlapY > 0) {
-      var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
-      if (curTop - height > 0) { // Fits above cursor
-        hints.style.top = (top = pos.top - height) + "px";
-        below = false;
-      } else if (height > winH) {
-        hints.style.height = (winH - 5) + "px";
-        hints.style.top = (top = pos.bottom - box.top) + "px";
-        var cursor = cm.getCursor();
-        if (data.from.ch != cursor.ch) {
-          pos = cm.cursorCoords(cursor);
-          hints.style.left = (left = pos.left) + "px";
-          box = hints.getBoundingClientRect();
-        }
-      }
-    }
-    var overlapX = box.right - winW;
-    if (overlapX > 0) {
-      if (box.right - box.left > winW) {
-        hints.style.width = (winW - 5) + "px";
-        overlapX -= (box.right - box.left) - winW;
-      }
-      hints.style.left = (left = pos.left - overlapX) + "px";
-    }
-    if (scrolls) for (var node = hints.firstChild; node; node = node.nextSibling)
-      node.style.paddingRight = cm.display.nativeBarWidth + "px"
-
-    cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
-      moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
-      setFocus: function(n) { widget.changeActive(n); },
-      menuSize: function() { return widget.screenAmount(); },
-      length: completions.length,
-      close: function() { completion.close(); },
-      pick: function() { widget.pick(); },
-      data: data
-    }));
-
-    if (completion.options.closeOnUnfocus) {
-      var closingOnBlur;
-      cm.on("blur", this.onBlur = function() { closingOnBlur = setTimeout(function() { completion.close(); }, 100); });
-      cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
-    }
-
-    cm.on("scroll", this.onScroll = function() {
-      var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
-      var newTop = top + startScroll.top - curScroll.top;
-      var point = newTop - (window.pageYOffset || (document.documentElement || document.body).scrollTop);
-      if (!below) point += hints.offsetHeight;
-      if (point <= editor.top || point >= editor.bottom) return completion.close();
-      hints.style.top = newTop + "px";
-      hints.style.left = (left + startScroll.left - curScroll.left) + "px";
-    });
-
-    CodeMirror.on(hints, "dblclick", function(e) {
-      var t = getHintElement(hints, e.target || e.srcElement);
-      if (t && t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
-    });
-
-    CodeMirror.on(hints, "click", function(e) {
-      var t = getHintElement(hints, e.target || e.srcElement);
-      if (t && t.hintId != null) {
-        widget.changeActive(t.hintId);
-        if (completion.options.completeOnSingleClick) widget.pick();
-      }
-    });
-
-    CodeMirror.on(hints, "mousedown", function() {
-      setTimeout(function(){cm.focus();}, 20);
-    });
-
-    CodeMirror.signal(data, "select", completions[0], hints.firstChild);
-    return true;
-  }
-
-  Widget.prototype = {
-    close: function() {
-      if (this.completion.widget != this) return;
-      this.completion.widget = null;
-      this.hints.parentNode.removeChild(this.hints);
-      this.completion.cm.removeKeyMap(this.keyMap);
-
-      var cm = this.completion.cm;
-      if (this.completion.options.closeOnUnfocus) {
-        cm.off("blur", this.onBlur);
-        cm.off("focus", this.onFocus);
-      }
-      cm.off("scroll", this.onScroll);
-    },
-
-    disable: function() {
-      this.completion.cm.removeKeyMap(this.keyMap);
-      var widget = this;
-      this.keyMap = {Enter: function() { widget.picked = true; }};
-      this.completion.cm.addKeyMap(this.keyMap);
-    },
-
-    pick: function() {
-      this.completion.pick(this.data, this.selectedHint);
-    },
-
-    changeActive: function(i, avoidWrap) {
-      if (i >= this.data.list.length)
-        i = avoidWrap ? this.data.list.length - 1 : 0;
-      else if (i < 0)
-        i = avoidWrap ? 0  : this.data.list.length - 1;
-      if (this.selectedHint == i) return;
-      var node = this.hints.childNodes[this.selectedHint];
-      node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
-      node = this.hints.childNodes[this.selectedHint = i];
-      node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
-      if (node.offsetTop < this.hints.scrollTop)
-        this.hints.scrollTop = node.offsetTop - 3;
-      else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
-        this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + 3;
-      CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
-    },
-
-    screenAmount: function() {
-      return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
-    }
-  };
-
-  function applicableHelpers(cm, helpers) {
-    if (!cm.somethingSelected()) return helpers
-    var result = []
-    for (var i = 0; i < helpers.length; i++)
-      if (helpers[i].supportsSelection) result.push(helpers[i])
-    return result
-  }
-
-  function fetchHints(hint, cm, options, callback) {
-    if (hint.async) {
-      hint(cm, callback, options)
-    } else {
-      var result = hint(cm, options)
-      if (result && result.then) result.then(callback)
-      else callback(result)
-    }
-  }
-
-  function resolveAutoHints(cm, pos) {
-    var helpers = cm.getHelpers(pos, "hint"), words
-    if (helpers.length) {
-      var resolved = function(cm, callback, options) {
-        var app = applicableHelpers(cm, helpers);
-        function run(i) {
-          if (i == app.length) return callback(null)
-          fetchHints(app[i], cm, options, function(result) {
-            if (result && result.list.length > 0) callback(result)
-            else run(i + 1)
-          })
-        }
-        run(0)
-      }
-      resolved.async = true
-      resolved.supportsSelection = true
-      return resolved
-    } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
-      return function(cm) { return CodeMirror.hint.fromList(cm, {words: words}) }
-    } else if (CodeMirror.hint.anyword) {
-      return function(cm, options) { return CodeMirror.hint.anyword(cm, options) }
-    } else {
-      return function() {}
-    }
-  }
-
-  CodeMirror.registerHelper("hint", "auto", {
-    resolve: resolveAutoHints
-  });
-
-  CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
-    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    var to = CodeMirror.Pos(cur.line, token.end);
-    if (token.string && /\w/.test(token.string[token.string.length - 1])) {
-      var term = token.string, from = CodeMirror.Pos(cur.line, token.start);
-    } else {
-      var term = "", from = to;
-    }
-    var found = [];
-    for (var i = 0; i < options.words.length; i++) {
-      var word = options.words[i];
-      if (word.slice(0, term.length) == term)
-        found.push(word);
-    }
-
-    if (found.length) return {list: found, from: from, to: to};
-  });
-
-  CodeMirror.commands.autocomplete = CodeMirror.showHint;
-
-  var defaultOptions = {
-    hint: CodeMirror.hint.auto,
-    completeSingle: true,
-    alignWithWord: true,
-    closeCharacters: /[\s()\[\]{};:>,]/,
-    closeOnUnfocus: true,
-    completeOnSingleClick: true,
-    container: null,
-    customKeys: null,
-    extraKeys: null
-  };
-
-  CodeMirror.defineOption("hintOptions", null);
-});

+ 0 - 41
web/staticres/codemirror/theme/3024-day.css

@@ -1,41 +0,0 @@
-/*
-
-    Name:       3024 day
-    Author:     Jan T. Sott (http://github.com/idleberg)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-day.CodeMirror { background: #f7f7f7; color: #3a3432; }
-.cm-s-3024-day div.CodeMirror-selected { background: #d6d5d4; }
-
-.cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
-.cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
-
-.cm-s-3024-day .CodeMirror-gutters { background: #f7f7f7; border-right: 0px; }
-.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
-.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
-.cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }
-
-.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855; }
-
-.cm-s-3024-day span.cm-comment { color: #cdab53; }
-.cm-s-3024-day span.cm-atom { color: #a16a94; }
-.cm-s-3024-day span.cm-number { color: #a16a94; }
-
-.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute { color: #01a252; }
-.cm-s-3024-day span.cm-keyword { color: #db2d20; }
-.cm-s-3024-day span.cm-string { color: #fded02; }
-
-.cm-s-3024-day span.cm-variable { color: #01a252; }
-.cm-s-3024-day span.cm-variable-2 { color: #01a0e4; }
-.cm-s-3024-day span.cm-def { color: #e8bbd0; }
-.cm-s-3024-day span.cm-bracket { color: #3a3432; }
-.cm-s-3024-day span.cm-tag { color: #db2d20; }
-.cm-s-3024-day span.cm-link { color: #a16a94; }
-.cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
-
-.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }

+ 0 - 39
web/staticres/codemirror/theme/3024-night.css

@@ -1,39 +0,0 @@
-/*
-
-    Name:       3024 night
-    Author:     Jan T. Sott (http://github.com/idleberg)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-night.CodeMirror { background: #090300; color: #d6d5d4; }
-.cm-s-3024-night div.CodeMirror-selected { background: #3a3432; }
-.cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
-.cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
-.cm-s-3024-night .CodeMirror-gutters { background: #090300; border-right: 0px; }
-.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
-.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
-.cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }
-
-.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c; }
-
-.cm-s-3024-night span.cm-comment { color: #cdab53; }
-.cm-s-3024-night span.cm-atom { color: #a16a94; }
-.cm-s-3024-night span.cm-number { color: #a16a94; }
-
-.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute { color: #01a252; }
-.cm-s-3024-night span.cm-keyword { color: #db2d20; }
-.cm-s-3024-night span.cm-string { color: #fded02; }
-
-.cm-s-3024-night span.cm-variable { color: #01a252; }
-.cm-s-3024-night span.cm-variable-2 { color: #01a0e4; }
-.cm-s-3024-night span.cm-def { color: #e8bbd0; }
-.cm-s-3024-night span.cm-bracket { color: #d6d5d4; }
-.cm-s-3024-night span.cm-tag { color: #db2d20; }
-.cm-s-3024-night span.cm-link { color: #a16a94; }
-.cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
-
-.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
-.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

+ 0 - 32
web/staticres/codemirror/theme/abcdef.css

@@ -1,32 +0,0 @@
-.cm-s-abcdef.CodeMirror { background: #0f0f0f; color: #defdef; }
-.cm-s-abcdef div.CodeMirror-selected { background: #515151; }
-.cm-s-abcdef .CodeMirror-line::selection, .cm-s-abcdef .CodeMirror-line > span::selection, .cm-s-abcdef .CodeMirror-line > span > span::selection { background: rgba(56, 56, 56, 0.99); }
-.cm-s-abcdef .CodeMirror-line::-moz-selection, .cm-s-abcdef .CodeMirror-line > span::-moz-selection, .cm-s-abcdef .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 56, 56, 0.99); }
-.cm-s-abcdef .CodeMirror-gutters { background: #555; border-right: 2px solid #314151; }
-.cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
-.cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
-.cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00; }
-
-.cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
-.cm-s-abcdef span.cm-atom { color: #77F; }
-.cm-s-abcdef span.cm-number { color: violet; }
-.cm-s-abcdef span.cm-def { color: #fffabc; }
-.cm-s-abcdef span.cm-variable { color: #abcdef; }
-.cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
-.cm-s-abcdef span.cm-variable-3 { color: #def; }
-.cm-s-abcdef span.cm-property { color: #fedcba; }
-.cm-s-abcdef span.cm-operator { color: #ff0; }
-.cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
-.cm-s-abcdef span.cm-string { color: #2b4; }
-.cm-s-abcdef span.cm-meta { color: #C9F; }
-.cm-s-abcdef span.cm-qualifier { color: #FFF700; }
-.cm-s-abcdef span.cm-builtin { color: #30aabc; }
-.cm-s-abcdef span.cm-bracket { color: #8a8a8a; }
-.cm-s-abcdef span.cm-tag { color: #FFDD44; }
-.cm-s-abcdef span.cm-attribute { color: #DDFF00; }
-.cm-s-abcdef span.cm-error { color: #FF0000; }
-.cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
-.cm-s-abcdef span.cm-link { color: blueviolet; }
-
-.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }

+ 0 - 5
web/staticres/codemirror/theme/ambiance-mobile.css

@@ -1,5 +0,0 @@
-.cm-s-ambiance.CodeMirror {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}

File diff suppressed because it is too large
+ 0 - 72
web/staticres/codemirror/theme/ambiance.css


+ 0 - 38
web/staticres/codemirror/theme/base16-dark.css

@@ -1,38 +0,0 @@
-/*
-
-    Name:       Base16 Default Dark
-    Author:     Chris Kempson (http://chriskempson.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-dark.CodeMirror { background: #151515; color: #e0e0e0; }
-.cm-s-base16-dark div.CodeMirror-selected { background: #303030; }
-.cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
-.cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
-.cm-s-base16-dark .CodeMirror-gutters { background: #151515; border-right: 0px; }
-.cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
-.cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
-.cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
-.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
-
-.cm-s-base16-dark span.cm-comment { color: #8f5536; }
-.cm-s-base16-dark span.cm-atom { color: #aa759f; }
-.cm-s-base16-dark span.cm-number { color: #aa759f; }
-
-.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute { color: #90a959; }
-.cm-s-base16-dark span.cm-keyword { color: #ac4142; }
-.cm-s-base16-dark span.cm-string { color: #f4bf75; }
-
-.cm-s-base16-dark span.cm-variable { color: #90a959; }
-.cm-s-base16-dark span.cm-variable-2 { color: #6a9fb5; }
-.cm-s-base16-dark span.cm-def { color: #d28445; }
-.cm-s-base16-dark span.cm-bracket { color: #e0e0e0; }
-.cm-s-base16-dark span.cm-tag { color: #ac4142; }
-.cm-s-base16-dark span.cm-link { color: #aa759f; }
-.cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
-
-.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
-.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

+ 0 - 38
web/staticres/codemirror/theme/base16-light.css

@@ -1,38 +0,0 @@
-/*
-
-    Name:       Base16 Default Light
-    Author:     Chris Kempson (http://chriskempson.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-light.CodeMirror { background: #f5f5f5; color: #202020; }
-.cm-s-base16-light div.CodeMirror-selected { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-gutters { background: #f5f5f5; border-right: 0px; }
-.cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
-.cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-linenumber { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050; }
-
-.cm-s-base16-light span.cm-comment { color: #8f5536; }
-.cm-s-base16-light span.cm-atom { color: #aa759f; }
-.cm-s-base16-light span.cm-number { color: #aa759f; }
-
-.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute { color: #90a959; }
-.cm-s-base16-light span.cm-keyword { color: #ac4142; }
-.cm-s-base16-light span.cm-string { color: #f4bf75; }
-
-.cm-s-base16-light span.cm-variable { color: #90a959; }
-.cm-s-base16-light span.cm-variable-2 { color: #6a9fb5; }
-.cm-s-base16-light span.cm-def { color: #d28445; }
-.cm-s-base16-light span.cm-bracket { color: #202020; }
-.cm-s-base16-light span.cm-tag { color: #ac4142; }
-.cm-s-base16-light span.cm-link { color: #aa759f; }
-.cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
-
-.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
-.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

+ 0 - 34
web/staticres/codemirror/theme/bespin.css

@@ -1,34 +0,0 @@
-/*
-
-    Name:       Bespin
-    Author:     Mozilla / Jan T. Sott
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-bespin.CodeMirror {background: #28211c; color: #9d9b97;}
-.cm-s-bespin div.CodeMirror-selected {background: #36312e !important;}
-.cm-s-bespin .CodeMirror-gutters {background: #28211c; border-right: 0px;}
-.cm-s-bespin .CodeMirror-linenumber {color: #666666;}
-.cm-s-bespin .CodeMirror-cursor {border-left: 1px solid #797977 !important;}
-
-.cm-s-bespin span.cm-comment {color: #937121;}
-.cm-s-bespin span.cm-atom {color: #9b859d;}
-.cm-s-bespin span.cm-number {color: #9b859d;}
-
-.cm-s-bespin span.cm-property, .cm-s-bespin span.cm-attribute {color: #54be0d;}
-.cm-s-bespin span.cm-keyword {color: #cf6a4c;}
-.cm-s-bespin span.cm-string {color: #f9ee98;}
-
-.cm-s-bespin span.cm-variable {color: #54be0d;}
-.cm-s-bespin span.cm-variable-2 {color: #5ea6ea;}
-.cm-s-bespin span.cm-def {color: #cf7d34;}
-.cm-s-bespin span.cm-error {background: #cf6a4c; color: #797977;}
-.cm-s-bespin span.cm-bracket {color: #9d9b97;}
-.cm-s-bespin span.cm-tag {color: #cf6a4c;}
-.cm-s-bespin span.cm-link {color: #9b859d;}
-
-.cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-bespin .CodeMirror-activeline-background { background: #404040; }

+ 0 - 32
web/staticres/codemirror/theme/blackboard.css

@@ -1,32 +0,0 @@
-/* Port of TextMate's Blackboard theme */
-
-.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
-.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
-.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
-.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
-.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
-.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
-.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
-
-.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
-.cm-s-blackboard .cm-atom { color: #D8FA3C; }
-.cm-s-blackboard .cm-number { color: #D8FA3C; }
-.cm-s-blackboard .cm-def { color: #8DA6CE; }
-.cm-s-blackboard .cm-variable { color: #FF6400; }
-.cm-s-blackboard .cm-operator { color: #FBDE2D; }
-.cm-s-blackboard .cm-comment { color: #AEAEAE; }
-.cm-s-blackboard .cm-string { color: #61CE3C; }
-.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
-.cm-s-blackboard .cm-meta { color: #D8FA3C; }
-.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
-.cm-s-blackboard .cm-tag { color: #8DA6CE; }
-.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
-.cm-s-blackboard .cm-header { color: #FF6400; }
-.cm-s-blackboard .cm-hr { color: #AEAEAE; }
-.cm-s-blackboard .cm-link { color: #8DA6CE; }
-.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
-
-.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
-.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }

+ 0 - 25
web/staticres/codemirror/theme/cobalt.css

@@ -1,25 +0,0 @@
-.cm-s-cobalt.CodeMirror { background: #002240; color: white; }
-.cm-s-cobalt div.CodeMirror-selected { background: #b36539; }
-.cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
-.cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
-.cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
-.cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-cobalt span.cm-comment { color: #08f; }
-.cm-s-cobalt span.cm-atom { color: #845dc4; }
-.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
-.cm-s-cobalt span.cm-keyword { color: #ffee80; }
-.cm-s-cobalt span.cm-string { color: #3ad900; }
-.cm-s-cobalt span.cm-meta { color: #ff9d00; }
-.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
-.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
-.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
-.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
-.cm-s-cobalt span.cm-link { color: #845dc4; }
-.cm-s-cobalt span.cm-error { color: #9d1e15; }
-
-.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
-.cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }

+ 0 - 33
web/staticres/codemirror/theme/colorforth.css

@@ -1,33 +0,0 @@
-.cm-s-colorforth.CodeMirror { background: #000000; color: #f8f8f8; }
-.cm-s-colorforth .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-colorforth .CodeMirror-guttermarker { color: #FFBD40; }
-.cm-s-colorforth .CodeMirror-guttermarker-subtle { color: #78846f; }
-.cm-s-colorforth .CodeMirror-linenumber { color: #bababa; }
-.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-colorforth span.cm-comment     { color: #ededed; }
-.cm-s-colorforth span.cm-def         { color: #ff1c1c; font-weight:bold; }
-.cm-s-colorforth span.cm-keyword     { color: #ffd900; }
-.cm-s-colorforth span.cm-builtin     { color: #00d95a; }
-.cm-s-colorforth span.cm-variable    { color: #73ff00; }
-.cm-s-colorforth span.cm-string      { color: #007bff; }
-.cm-s-colorforth span.cm-number      { color: #00c4ff; }
-.cm-s-colorforth span.cm-atom        { color: #606060; }
-
-.cm-s-colorforth span.cm-variable-2  { color: #EEE; }
-.cm-s-colorforth span.cm-variable-3  { color: #DDD; }
-.cm-s-colorforth span.cm-property    {}
-.cm-s-colorforth span.cm-operator    {}
-
-.cm-s-colorforth span.cm-meta        { color: yellow; }
-.cm-s-colorforth span.cm-qualifier   { color: #FFF700; }
-.cm-s-colorforth span.cm-bracket     { color: #cc7; }
-.cm-s-colorforth span.cm-tag         { color: #FFBD40; }
-.cm-s-colorforth span.cm-attribute   { color: #FFF700; }
-.cm-s-colorforth span.cm-error       { color: #f00; }
-
-.cm-s-colorforth div.CodeMirror-selected { background: #333d53; }
-
-.cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
-
-.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }

+ 0 - 41
web/staticres/codemirror/theme/dracula.css

@@ -1,41 +0,0 @@
-/*
-
-    Name:       dracula
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original dracula color scheme by Zeno Rocha (https://github.com/zenorocha/dracula-theme)
-
-*/
-
-
-.cm-s-dracula.CodeMirror, .cm-s-dracula .CodeMirror-gutters {
-  background-color: #282a36 !important;
-  color: #f8f8f2 !important;
-  border: none;
-}
-.cm-s-dracula .CodeMirror-gutters { color: #282a36; }
-.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
-.cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-dracula.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula span.cm-comment { color: #6272a4; }
-.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 { color: #f1fa8c; }
-.cm-s-dracula span.cm-number { color: #bd93f9; }
-.cm-s-dracula span.cm-variable { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-2 { color: white; }
-.cm-s-dracula span.cm-def { color: #ffb86c; }
-.cm-s-dracula span.cm-keyword { color: #ff79c6; }
-.cm-s-dracula span.cm-operator { color: #ff79c6; }
-.cm-s-dracula span.cm-keyword { color: #ff79c6; }
-.cm-s-dracula span.cm-atom { color: #bd93f9; }
-.cm-s-dracula span.cm-meta { color: #f8f8f2; }
-.cm-s-dracula span.cm-tag { color: #ff79c6; }
-.cm-s-dracula span.cm-attribute { color: #50fa7b; }
-.cm-s-dracula span.cm-qualifier { color: #50fa7b; }
-.cm-s-dracula span.cm-property { color: #66d9ef; }
-.cm-s-dracula span.cm-builtin { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-3 { color: #50fa7b; }
-
-.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
-.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

+ 0 - 23
web/staticres/codemirror/theme/eclipse.css

@@ -1,23 +0,0 @@
-.cm-s-eclipse span.cm-meta { color: #FF1717; }
-.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
-.cm-s-eclipse span.cm-atom { color: #219; }
-.cm-s-eclipse span.cm-number { color: #164; }
-.cm-s-eclipse span.cm-def { color: #00f; }
-.cm-s-eclipse span.cm-variable { color: black; }
-.cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
-.cm-s-eclipse span.cm-variable-3 { color: #0000C0; }
-.cm-s-eclipse span.cm-property { color: black; }
-.cm-s-eclipse span.cm-operator { color: black; }
-.cm-s-eclipse span.cm-comment { color: #3F7F5F; }
-.cm-s-eclipse span.cm-string { color: #2A00FF; }
-.cm-s-eclipse span.cm-string-2 { color: #f50; }
-.cm-s-eclipse span.cm-qualifier { color: #555; }
-.cm-s-eclipse span.cm-builtin { color: #30a; }
-.cm-s-eclipse span.cm-bracket { color: #cc7; }
-.cm-s-eclipse span.cm-tag { color: #170; }
-.cm-s-eclipse span.cm-attribute { color: #00c; }
-.cm-s-eclipse span.cm-link { color: #219; }
-.cm-s-eclipse span.cm-error { color: #f00; }
-
-.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }

+ 0 - 13
web/staticres/codemirror/theme/elegant.css

@@ -1,13 +0,0 @@
-.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom { color: #762; }
-.cm-s-elegant span.cm-comment { color: #262; font-style: italic; line-height: 1em; }
-.cm-s-elegant span.cm-meta { color: #555; font-style: italic; line-height: 1em; }
-.cm-s-elegant span.cm-variable { color: black; }
-.cm-s-elegant span.cm-variable-2 { color: #b11; }
-.cm-s-elegant span.cm-qualifier { color: #555; }
-.cm-s-elegant span.cm-keyword { color: #730; }
-.cm-s-elegant span.cm-builtin { color: #30a; }
-.cm-s-elegant span.cm-link { color: #762; }
-.cm-s-elegant span.cm-error { background-color: #fdd; }
-
-.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }

+ 0 - 34
web/staticres/codemirror/theme/erlang-dark.css

@@ -1,34 +0,0 @@
-.cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
-.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539; }
-.cm-s-erlang-dark .CodeMirror-line::selection, .cm-s-erlang-dark .CodeMirror-line > span::selection, .cm-s-erlang-dark .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
-.cm-s-erlang-dark .CodeMirror-line::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
-.cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
-.cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
-.cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
-.cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
-.cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
-.cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
-.cm-s-erlang-dark span.cm-comment    { color: #77f; }
-.cm-s-erlang-dark span.cm-def        { color: #e7a; }
-.cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
-.cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
-.cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
-.cm-s-erlang-dark span.cm-operator   { color: #d55; }
-.cm-s-erlang-dark span.cm-property   { color: #ccc; }
-.cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
-.cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
-.cm-s-erlang-dark span.cm-string     { color: #3ad900; }
-.cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
-.cm-s-erlang-dark span.cm-tag        { color: #9effff; }
-.cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
-.cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
-.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
-.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
-
-.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
-.cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

+ 0 - 34
web/staticres/codemirror/theme/hopscotch.css

@@ -1,34 +0,0 @@
-/*
-
-    Name:       Hopscotch
-    Author:     Jan T. Sott
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-hopscotch.CodeMirror {background: #322931; color: #d5d3d5;}
-.cm-s-hopscotch div.CodeMirror-selected {background: #433b42 !important;}
-.cm-s-hopscotch .CodeMirror-gutters {background: #322931; border-right: 0px;}
-.cm-s-hopscotch .CodeMirror-linenumber {color: #797379;}
-.cm-s-hopscotch .CodeMirror-cursor {border-left: 1px solid #989498 !important;}
-
-.cm-s-hopscotch span.cm-comment {color: #b33508;}
-.cm-s-hopscotch span.cm-atom {color: #c85e7c;}
-.cm-s-hopscotch span.cm-number {color: #c85e7c;}
-
-.cm-s-hopscotch span.cm-property, .cm-s-hopscotch span.cm-attribute {color: #8fc13e;}
-.cm-s-hopscotch span.cm-keyword {color: #dd464c;}
-.cm-s-hopscotch span.cm-string {color: #fdcc59;}
-
-.cm-s-hopscotch span.cm-variable {color: #8fc13e;}
-.cm-s-hopscotch span.cm-variable-2 {color: #1290bf;}
-.cm-s-hopscotch span.cm-def {color: #fd8b19;}
-.cm-s-hopscotch span.cm-error {background: #dd464c; color: #989498;}
-.cm-s-hopscotch span.cm-bracket {color: #d5d3d5;}
-.cm-s-hopscotch span.cm-tag {color: #dd464c;}
-.cm-s-hopscotch span.cm-link {color: #c85e7c;}
-
-.cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-hopscotch .CodeMirror-activeline-background { background: #302020; }

+ 0 - 43
web/staticres/codemirror/theme/icecoder.css

@@ -1,43 +0,0 @@
-/*
-ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
-*/
-
-.cm-s-icecoder { color: #666; background: #1d1d1b; }
-
-.cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; }  /* off-white 1 */
-.cm-s-icecoder span.cm-atom { color: #e1c76e; }                    /* yellow */
-.cm-s-icecoder span.cm-number { color: #6cb5d9; }                  /* blue */
-.cm-s-icecoder span.cm-def { color: #b9ca4a; }                     /* green */
-
-.cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
-.cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
-.cm-s-icecoder span.cm-variable-3 { color: #f9602c; }              /* orange */
-
-.cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
-.cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
-.cm-s-icecoder span.cm-comment { color: #97a3aa; }                 /* grey-blue */
-
-.cm-s-icecoder span.cm-string { color: #b9ca4a; }                  /* green */
-.cm-s-icecoder span.cm-string-2 { color: #6cb5d9; }                /* blue */
-
-.cm-s-icecoder span.cm-meta { color: #555; }                       /* grey */
-
-.cm-s-icecoder span.cm-qualifier { color: #555; }                  /* grey */
-.cm-s-icecoder span.cm-builtin { color: #214e7b; }                 /* bright blue */
-.cm-s-icecoder span.cm-bracket { color: #cc7; }                    /* grey-yellow */
-
-.cm-s-icecoder span.cm-tag { color: #e8e8e8; }                     /* off-white 2 */
-.cm-s-icecoder span.cm-attribute { color: #099; }                  /* teal */
-
-.cm-s-icecoder span.cm-header { color: #6a0d6a; }                  /* purple-pink */
-.cm-s-icecoder span.cm-quote { color: #186718; }                   /* dark green */
-.cm-s-icecoder span.cm-hr { color: #888; }                         /* mid-grey */
-.cm-s-icecoder span.cm-link { color: #e1c76e; }                    /* yellow */
-.cm-s-icecoder span.cm-error { color: #d00; }                      /* red */
-
-.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
-.cm-s-icecoder .CodeMirror-gutters { background: #1d1d1b; min-width: 41px; border-right: 0; }
-.cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
-.cm-s-icecoder .CodeMirror-matchingbracket { color: #fff !important; background: #555 !important; }
-.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }

+ 0 - 34
web/staticres/codemirror/theme/isotope.css

@@ -1,34 +0,0 @@
-/*
-
-    Name:       Isotope
-    Author:     David Desandro / Jan T. Sott
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-isotope.CodeMirror {background: #000000; color: #e0e0e0;}
-.cm-s-isotope div.CodeMirror-selected {background: #404040 !important;}
-.cm-s-isotope .CodeMirror-gutters {background: #000000; border-right: 0px;}
-.cm-s-isotope .CodeMirror-linenumber {color: #808080;}
-.cm-s-isotope .CodeMirror-cursor {border-left: 1px solid #c0c0c0 !important;}
-
-.cm-s-isotope span.cm-comment {color: #3300ff;}
-.cm-s-isotope span.cm-atom {color: #cc00ff;}
-.cm-s-isotope span.cm-number {color: #cc00ff;}
-
-.cm-s-isotope span.cm-property, .cm-s-isotope span.cm-attribute {color: #33ff00;}
-.cm-s-isotope span.cm-keyword {color: #ff0000;}
-.cm-s-isotope span.cm-string {color: #ff0099;}
-
-.cm-s-isotope span.cm-variable {color: #33ff00;}
-.cm-s-isotope span.cm-variable-2 {color: #0066ff;}
-.cm-s-isotope span.cm-def {color: #ff9900;}
-.cm-s-isotope span.cm-error {background: #ff0000; color: #c0c0c0;}
-.cm-s-isotope span.cm-bracket {color: #e0e0e0;}
-.cm-s-isotope span.cm-tag {color: #ff0000;}
-.cm-s-isotope span.cm-link {color: #cc00ff;}
-
-.cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-isotope .CodeMirror-activeline-background { background: #202020; }

+ 0 - 47
web/staticres/codemirror/theme/lesser-dark.css

@@ -1,47 +0,0 @@
-/*
-http://lesscss.org/ dark theme
-Ported to CodeMirror by Peter Kroon
-*/
-.cm-s-lesser-dark {
-  line-height: 1.3em;
-}
-.cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
-.cm-s-lesser-dark div.CodeMirror-selected { background: #45443B; } /* 33322B*/
-.cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
-.cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
-.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
-
-.cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
-
-.cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
-.cm-s-lesser-dark .CodeMirror-guttermarker { color: #599eff; }
-.cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
-
-.cm-s-lesser-dark span.cm-header { color: #a0a; }
-.cm-s-lesser-dark span.cm-quote { color: #090; }
-.cm-s-lesser-dark span.cm-keyword { color: #599eff; }
-.cm-s-lesser-dark span.cm-atom { color: #C2B470; }
-.cm-s-lesser-dark span.cm-number { color: #B35E4D; }
-.cm-s-lesser-dark span.cm-def { color: white; }
-.cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
-.cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
-.cm-s-lesser-dark span.cm-variable-3 { color: white; }
-.cm-s-lesser-dark span.cm-property { color: #92A75C; }
-.cm-s-lesser-dark span.cm-operator { color: #92A75C; }
-.cm-s-lesser-dark span.cm-comment { color: #666; }
-.cm-s-lesser-dark span.cm-string { color: #BCD279; }
-.cm-s-lesser-dark span.cm-string-2 { color: #f50; }
-.cm-s-lesser-dark span.cm-meta { color: #738C73; }
-.cm-s-lesser-dark span.cm-qualifier { color: #555; }
-.cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
-.cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
-.cm-s-lesser-dark span.cm-tag { color: #669199; }
-.cm-s-lesser-dark span.cm-attribute { color: #00c; }
-.cm-s-lesser-dark span.cm-hr { color: #999; }
-.cm-s-lesser-dark span.cm-link { color: #00c; }
-.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
-
-.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
-.cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

+ 0 - 95
web/staticres/codemirror/theme/liquibyte.css

@@ -1,95 +0,0 @@
-.cm-s-liquibyte.CodeMirror {
-	background-color: #000;
-	color: #fff;
-	line-height: 1.2em;
-	font-size: 1em;
-}
-.cm-s-liquibyte .CodeMirror-focused .cm-matchhighlight {
-	text-decoration: underline;
-	text-decoration-color: #0f0;
-	text-decoration-style: wavy;
-}
-.cm-s-liquibyte .cm-trailingspace {
-	text-decoration: line-through;
-	text-decoration-color: #f00;
-	text-decoration-style: dotted;
-}
-.cm-s-liquibyte .cm-tab {
-	text-decoration: line-through;
-	text-decoration-color: #404040;
-	text-decoration-style: dotted;
-}
-.cm-s-liquibyte .CodeMirror-gutters { background-color: #262626; border-right: 1px solid #505050; padding-right: 0.8em; }
-.cm-s-liquibyte .CodeMirror-gutter-elt div { font-size: 1.2em; }
-.cm-s-liquibyte .CodeMirror-guttermarker {  }
-.cm-s-liquibyte .CodeMirror-guttermarker-subtle {  }
-.cm-s-liquibyte .CodeMirror-linenumber { color: #606060; padding-left: 0; }
-.cm-s-liquibyte .CodeMirror-cursor { border-left: 1px solid #eee; }
-
-.cm-s-liquibyte span.cm-comment     { color: #008000; }
-.cm-s-liquibyte span.cm-def         { color: #ffaf40; font-weight: bold; }
-.cm-s-liquibyte span.cm-keyword     { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-builtin     { color: #ffaf40; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable    { color: #5967ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-string      { color: #ff8000; }
-.cm-s-liquibyte span.cm-number      { color: #0f0; font-weight: bold; }
-.cm-s-liquibyte span.cm-atom        { color: #bf3030; font-weight: bold; }
-
-.cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable-3  { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
-.cm-s-liquibyte span.cm-operator    { color: #fff; }
-
-.cm-s-liquibyte span.cm-meta        { color: #0f0; }
-.cm-s-liquibyte span.cm-qualifier   { color: #fff700; font-weight: bold; }
-.cm-s-liquibyte span.cm-bracket     { color: #cc7; }
-.cm-s-liquibyte span.cm-tag         { color: #ff0; font-weight: bold; }
-.cm-s-liquibyte span.cm-attribute   { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-error       { color: #f00; }
-
-.cm-s-liquibyte div.CodeMirror-selected { background-color: rgba(255, 0, 0, 0.25); }
-
-.cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
-
-.cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
-
-/* Default styles for common addons */
-.cm-s-liquibyte .CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
-.cm-s-liquibyte .CodeMirror span.CodeMirror-nonmatchingbracket { color: #f00; font-weight: bold; }
-.CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
-/* Scrollbars */
-/* Simple */
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, div.CodeMirror-simplescroll-vertical div:hover {
-	background-color: rgba(80, 80, 80, .7);
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, div.CodeMirror-simplescroll-vertical div {
-	background-color: rgba(80, 80, 80, .3);
-	border: 1px solid #404040;
-	border-radius: 5px;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
-	border-top: 1px solid #404040;
-	border-bottom: 1px solid #404040;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div {
-	border-left: 1px solid #404040;
-	border-right: 1px solid #404040;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-vertical {
-	background-color: #262626;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal {
-	background-color: #262626;
-	border-top: 1px solid #404040;
-}
-/* Overlay */
-.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
-	background-color: #404040;
-	border-radius: 5px;
-}
-.cm-s-liquibyte div.CodeMirror-overlayscroll-vertical div {
-	border: 1px solid #404040;
-}
-.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div {
-	border: 1px solid #404040;
-}

+ 0 - 53
web/staticres/codemirror/theme/material.css

@@ -1,53 +0,0 @@
-/*
-
-    Name:       material
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original material color scheme by Mattia Astorino (https://github.com/equinusocio/material-theme)
-
-*/
-
-.cm-s-material {
-  background-color: #263238;
-  color: rgba(233, 237, 237, 1);
-}
-.cm-s-material .CodeMirror-gutters {
-  background: #263238;
-  color: rgb(83,127,126);
-  border: none;
-}
-.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
-.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
-.cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
-.cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
-.cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
-.cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-variable-2 { color: #80CBC4; }
-.cm-s-material .cm-variable-3 { color: #82B1FF; }
-.cm-s-material .cm-builtin { color: #DECB6B; }
-.cm-s-material .cm-atom { color: #F77669; }
-.cm-s-material .cm-number { color: #F77669; }
-.cm-s-material .cm-def { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-string { color: #C3E88D; }
-.cm-s-material .cm-string-2 { color: #80CBC4; }
-.cm-s-material .cm-comment { color: #546E7A; }
-.cm-s-material .cm-variable { color: #82B1FF; }
-.cm-s-material .cm-tag { color: #80CBC4; }
-.cm-s-material .cm-meta { color: #80CBC4; }
-.cm-s-material .cm-attribute { color: #FFCB6B; }
-.cm-s-material .cm-property { color: #80CBAE; }
-.cm-s-material .cm-qualifier { color: #DECB6B; }
-.cm-s-material .cm-variable-3 { color: #DECB6B; }
-.cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
-.cm-s-material .cm-error {
-  color: rgba(255, 255, 255, 1.0);
-  background-color: #EC5F67;
-}
-.cm-s-material .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}

+ 0 - 37
web/staticres/codemirror/theme/mbo.css

@@ -1,37 +0,0 @@
-/****************************************************************/
-/*   Based on mbonaci's Brackets mbo theme                      */
-/*   https://github.com/mbonaci/global/blob/master/Mbo.tmTheme  */
-/*   Create your own: http://tmtheme-editor.herokuapp.com       */
-/****************************************************************/
-
-.cm-s-mbo.CodeMirror { background: #2c2c2c; color: #ffffec; }
-.cm-s-mbo div.CodeMirror-selected { background: #716C62; }
-.cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
-.cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
-.cm-s-mbo .CodeMirror-gutters { background: #4e4e4e; border-right: 0px; }
-.cm-s-mbo .CodeMirror-guttermarker { color: white; }
-.cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
-.cm-s-mbo .CodeMirror-linenumber { color: #dadada; }
-.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec; }
-
-.cm-s-mbo span.cm-comment { color: #95958a; }
-.cm-s-mbo span.cm-atom { color: #00a8c6; }
-.cm-s-mbo span.cm-number { color: #00a8c6; }
-
-.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute { color: #9ddfe9; }
-.cm-s-mbo span.cm-keyword { color: #ffb928; }
-.cm-s-mbo span.cm-string { color: #ffcf6c; }
-.cm-s-mbo span.cm-string.cm-property { color: #ffffec; }
-
-.cm-s-mbo span.cm-variable { color: #ffffec; }
-.cm-s-mbo span.cm-variable-2 { color: #00a8c6; }
-.cm-s-mbo span.cm-def { color: #ffffec; }
-.cm-s-mbo span.cm-bracket { color: #fffffc; font-weight: bold; }
-.cm-s-mbo span.cm-tag { color: #9ddfe9; }
-.cm-s-mbo span.cm-link { color: #f54b07; }
-.cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
-.cm-s-mbo span.cm-qualifier { color: #ffffec; }
-
-.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
-.cm-s-mbo .CodeMirror-matchingbracket { color: #ffb928 !important; }
-.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }

File diff suppressed because it is too large
+ 0 - 45
web/staticres/codemirror/theme/mdn-like.css


+ 0 - 45
web/staticres/codemirror/theme/midnight.css

@@ -1,45 +0,0 @@
-/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
-
-/*<!--match-->*/
-.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949; }
-.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
-
-/*<!--activeline-->*/
-.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
-
-.cm-s-midnight.CodeMirror {
-    background: #0F192A;
-    color: #D1EDFF;
-}
-
-.cm-s-midnight.CodeMirror { border-top: 1px solid black; border-bottom: 1px solid black; }
-
-.cm-s-midnight div.CodeMirror-selected { background: #314D67; }
-.cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
-.cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
-.cm-s-midnight .CodeMirror-gutters { background: #0F192A; border-right: 1px solid; }
-.cm-s-midnight .CodeMirror-guttermarker { color: white; }
-.cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-midnight .CodeMirror-linenumber { color: #D0D0D0; }
-.cm-s-midnight .CodeMirror-cursor { border-left: 1px solid #F8F8F0; }
-
-.cm-s-midnight span.cm-comment { color: #428BDD; }
-.cm-s-midnight span.cm-atom { color: #AE81FF; }
-.cm-s-midnight span.cm-number { color: #D1EDFF; }
-
-.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute { color: #A6E22E; }
-.cm-s-midnight span.cm-keyword { color: #E83737; }
-.cm-s-midnight span.cm-string { color: #1DC116; }
-
-.cm-s-midnight span.cm-variable { color: #FFAA3E; }
-.cm-s-midnight span.cm-variable-2 { color: #FFAA3E; }
-.cm-s-midnight span.cm-def { color: #4DD; }
-.cm-s-midnight span.cm-bracket { color: #D1EDFF; }
-.cm-s-midnight span.cm-tag { color: #449; }
-.cm-s-midnight span.cm-link { color: #AE81FF; }
-.cm-s-midnight span.cm-error { background: #F92672; color: #F8F8F0; }
-
-.cm-s-midnight .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}

+ 0 - 36
web/staticres/codemirror/theme/monokai.css

@@ -1,36 +0,0 @@
-/* Based on Sublime Text's Monokai theme */
-
-.cm-s-monokai.CodeMirror { background: #272822; color: #f8f8f2; }
-.cm-s-monokai div.CodeMirror-selected { background: #49483E; }
-.cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
-.cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
-.cm-s-monokai .CodeMirror-gutters { background: #272822; border-right: 0px; }
-.cm-s-monokai .CodeMirror-guttermarker { color: white; }
-.cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
-
-.cm-s-monokai span.cm-comment { color: #75715e; }
-.cm-s-monokai span.cm-atom { color: #ae81ff; }
-.cm-s-monokai span.cm-number { color: #ae81ff; }
-
-.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
-.cm-s-monokai span.cm-keyword { color: #f92672; }
-.cm-s-monokai span.cm-builtin { color: #66d9ef; }
-.cm-s-monokai span.cm-string { color: #e6db74; }
-
-.cm-s-monokai span.cm-variable { color: #f8f8f2; }
-.cm-s-monokai span.cm-variable-2 { color: #9effff; }
-.cm-s-monokai span.cm-variable-3 { color: #66d9ef; }
-.cm-s-monokai span.cm-def { color: #fd971f; }
-.cm-s-monokai span.cm-bracket { color: #f8f8f2; }
-.cm-s-monokai span.cm-tag { color: #f92672; }
-.cm-s-monokai span.cm-header { color: #ae81ff; }
-.cm-s-monokai span.cm-link { color: #ae81ff; }
-.cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
-
-.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
-.cm-s-monokai .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}

+ 0 - 12
web/staticres/codemirror/theme/neat.css

@@ -1,12 +0,0 @@
-.cm-s-neat span.cm-comment { color: #a86; }
-.cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
-.cm-s-neat span.cm-string { color: #a22; }
-.cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; }
-.cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
-.cm-s-neat span.cm-variable { color: black; }
-.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
-.cm-s-neat span.cm-meta { color: #555; }
-.cm-s-neat span.cm-link { color: #3a3; }
-
-.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }

+ 0 - 43
web/staticres/codemirror/theme/neo.css

@@ -1,43 +0,0 @@
-/* neo theme for codemirror */
-
-/* Color scheme */
-
-.cm-s-neo.CodeMirror {
-  background-color:#ffffff;
-  color:#2e383c;
-  line-height:1.4375;
-}
-.cm-s-neo .cm-comment { color:#75787b; }
-.cm-s-neo .cm-keyword, .cm-s-neo .cm-property { color:#1d75b3; }
-.cm-s-neo .cm-atom,.cm-s-neo .cm-number { color:#75438a; }
-.cm-s-neo .cm-node,.cm-s-neo .cm-tag { color:#9c3328; }
-.cm-s-neo .cm-string { color:#b35e14; }
-.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier { color:#047d65; }
-
-
-/* Editor styling */
-
-.cm-s-neo pre {
-  padding:0;
-}
-
-.cm-s-neo .CodeMirror-gutters {
-  border:none;
-  border-right:10px solid transparent;
-  background-color:transparent;
-}
-
-.cm-s-neo .CodeMirror-linenumber {
-  padding:0;
-  color:#e0e2e5;
-}
-
-.cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
-.cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
-
-.cm-s-neo .CodeMirror-cursor {
-  width: auto;
-  border: 0;
-  background: rgba(155,157,162,0.37);
-  z-index: 1;
-}

+ 0 - 27
web/staticres/codemirror/theme/night.css

@@ -1,27 +0,0 @@
-/* Loosely based on the Midnight Textmate theme */
-
-.cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-night div.CodeMirror-selected { background: #447; }
-.cm-s-night .CodeMirror-line::selection, .cm-s-night .CodeMirror-line > span::selection, .cm-s-night .CodeMirror-line > span > span::selection { background: rgba(68, 68, 119, .99); }
-.cm-s-night .CodeMirror-line::-moz-selection, .cm-s-night .CodeMirror-line > span::-moz-selection, .cm-s-night .CodeMirror-line > span > span::-moz-selection { background: rgba(68, 68, 119, .99); }
-.cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-night .CodeMirror-guttermarker { color: white; }
-.cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
-.cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-night .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-night span.cm-comment { color: #8900d1; }
-.cm-s-night span.cm-atom { color: #845dc4; }
-.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
-.cm-s-night span.cm-keyword { color: #599eff; }
-.cm-s-night span.cm-string { color: #37f14a; }
-.cm-s-night span.cm-meta { color: #7678e2; }
-.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
-.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
-.cm-s-night span.cm-bracket { color: #8da6ce; }
-.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
-.cm-s-night span.cm-link { color: #845dc4; }
-.cm-s-night span.cm-error { color: #9d1e15; }
-
-.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
-.cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

+ 0 - 94
web/staticres/codemirror/theme/panda-syntax.css

@@ -1,94 +0,0 @@
-/*
-
-	Name:       Panda Syntax
-	Author:     Siamak Mokhtari (http://github.com/siamak/)
-
-	CodeMirror template by Siamak Mokhtari (https://github.com/siamak/atom-panda-syntax)
-
-*/
-.cm-s-panda-syntax {
-	/*font-family: 'Operator Mono', 'Source Sans Pro', Helvetica, Arial, sans-serif;*/
-	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
-	background: #292A2B;
-	color: #E6E6E6;
-}
-.cm-s-panda-syntax .CodeMirror-activeline-background {
-	background: #404954;
-}
-
-.cm-s-panda-syntax .cm-comment {
-	font-style: italic;
-	color: #676B79;
-}
-.cm-s-panda-syntax .cm-string,
-.cm-s-panda-syntax .cm-string-2 {
-	color: #19F9D8;
-}
-.cm-s-panda-syntax .cm-number {
-	color: #FFB86C;
-}
-.cm-s-panda-syntax .cm-atom {
-	color: #FFB86C;
-}
-
-.cm-s-panda-syntax .cm-keyword {
-	color: #FF75B5;
-}
-.cm-s-panda-syntax .cm-keyword-2 {
-	color: #FF75B5;
-}
-.cm-s-panda-syntax .cm-keyword-3 {
-	color: #B084EB;
-}
-
-.cm-s-panda-syntax .cm-variable {
-	color: #FF9AC1;
-}
-.cm-s-panda-syntax .cm-variable-2 {
-	color: #e6e6e6;
-}
-.cm-s-panda-syntax .cm-variable-3 {
-	color: #82B1FF;
-}
-
-.cm-s-panda-syntax .cm-def {
-	/*font-style: italic;*/
-	color: #e6e6e6;
-}
-.cm-s-panda-syntax .cm-def-2 {
-	font-style: italic;
-	color: #ffcc95;
-}
-
-
-.cm-s-panda-syntax .cm-property {
-	color: #6FC1FF;
-}
-
-.cm-s-panda-syntax .cm-matchingbracket,
-.CodeMirror .CodeMirror-matchingbracket {
-	color: #E6E6E6 !important;
-	border-bottom: 1px dotted #19f9d8;
-	padding-bottom: 2px;
-}
-
-.cm-s-panda-syntax .CodeMirror-gutters {
-	background: #292A2B;
-	color: #757575;
-	border: none;
-}
-.cm-s-panda-syntax .CodeMirror-guttermarker, .cm-s-panda-syntax .CodeMirror-guttermarker-subtle, .cm-s-panda-syntax .CodeMirror-linenumber {
-	color: #757575;
-}
-.cm-s-panda-syntax .CodeMirror-linenumber {
-	padding-right: 10px;
-}
-.cm-s-panda-syntax .CodeMirror-cursor {
-	border-left: 1px solid #757575;
-}
-/*.cm-s-panda-syntax div.CodeMirror-selected { background: rgba(255, 255, 255, 0.5); }*/
-.cm-s-panda-syntax.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.25); }
-.cm-s-panda-syntax .CodeMirror-line::selection, .cm-s-panda-syntax .CodeMirror-line > span::selection, .cm-s-panda-syntax .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-panda-syntax .CodeMirror-line::-moz-selection, .cm-s-panda-syntax .CodeMirror-line > span::-moz-selection, .cm-s-panda-syntax .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-.cm-s-panda-syntax .CodeMirror-activeline-background { background: rgba(99, 123, 156, 0.125); }

+ 0 - 38
web/staticres/codemirror/theme/paraiso-dark.css

@@ -1,38 +0,0 @@
-/*
-
-    Name:       Paraíso (Dark)
-    Author:     Jan T. Sott
-
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
-    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-dark.CodeMirror { background: #2f1e2e; color: #b9b6b0; }
-.cm-s-paraiso-dark div.CodeMirror-selected { background: #41323f; }
-.cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
-.cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
-.cm-s-paraiso-dark .CodeMirror-gutters { background: #2f1e2e; border-right: 0px; }
-.cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
-.cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-linenumber { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687; }
-
-.cm-s-paraiso-dark span.cm-comment { color: #e96ba8; }
-.cm-s-paraiso-dark span.cm-atom { color: #815ba4; }
-.cm-s-paraiso-dark span.cm-number { color: #815ba4; }
-
-.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute { color: #48b685; }
-.cm-s-paraiso-dark span.cm-keyword { color: #ef6155; }
-.cm-s-paraiso-dark span.cm-string { color: #fec418; }
-
-.cm-s-paraiso-dark span.cm-variable { color: #48b685; }
-.cm-s-paraiso-dark span.cm-variable-2 { color: #06b6ef; }
-.cm-s-paraiso-dark span.cm-def { color: #f99b15; }
-.cm-s-paraiso-dark span.cm-bracket { color: #b9b6b0; }
-.cm-s-paraiso-dark span.cm-tag { color: #ef6155; }
-.cm-s-paraiso-dark span.cm-link { color: #815ba4; }
-.cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
-
-.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
-.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

+ 0 - 38
web/staticres/codemirror/theme/paraiso-light.css

@@ -1,38 +0,0 @@
-/*
-
-    Name:       Paraíso (Light)
-    Author:     Jan T. Sott
-
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
-    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-light.CodeMirror { background: #e7e9db; color: #41323f; }
-.cm-s-paraiso-light div.CodeMirror-selected { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-gutters { background: #e7e9db; border-right: 0px; }
-.cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
-.cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-linenumber { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71; }
-
-.cm-s-paraiso-light span.cm-comment { color: #e96ba8; }
-.cm-s-paraiso-light span.cm-atom { color: #815ba4; }
-.cm-s-paraiso-light span.cm-number { color: #815ba4; }
-
-.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute { color: #48b685; }
-.cm-s-paraiso-light span.cm-keyword { color: #ef6155; }
-.cm-s-paraiso-light span.cm-string { color: #fec418; }
-
-.cm-s-paraiso-light span.cm-variable { color: #48b685; }
-.cm-s-paraiso-light span.cm-variable-2 { color: #06b6ef; }
-.cm-s-paraiso-light span.cm-def { color: #f99b15; }
-.cm-s-paraiso-light span.cm-bracket { color: #41323f; }
-.cm-s-paraiso-light span.cm-tag { color: #ef6155; }
-.cm-s-paraiso-light span.cm-link { color: #815ba4; }
-.cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
-
-.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
-.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

+ 0 - 53
web/staticres/codemirror/theme/pastel-on-dark.css

@@ -1,53 +0,0 @@
-/**
- * Pastel On Dark theme ported from ACE editor
- * @license MIT
- * @copyright AtomicPages LLC 2014
- * @author Dennis Thompson, AtomicPages LLC
- * @version 1.1
- * @source https://github.com/atomicpages/codemirror-pastel-on-dark-theme
- */
-
-.cm-s-pastel-on-dark.CodeMirror {
-	background: #2c2827;
-	color: #8F938F;
-	line-height: 1.5;
-	font-size: 14px;
-}
-.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
-.cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
-.cm-s-pastel-on-dark .CodeMirror-line::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(221,240,255,0.2); }
-
-.cm-s-pastel-on-dark .CodeMirror-gutters {
-	background: #34302f;
-	border-right: 0px;
-	padding: 0 3px;
-}
-.cm-s-pastel-on-dark .CodeMirror-guttermarker { color: white; }
-.cm-s-pastel-on-dark .CodeMirror-guttermarker-subtle { color: #8F938F; }
-.cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
-.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
-.cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
-.cm-s-pastel-on-dark span.cm-atom { color: #DE8E30; }
-.cm-s-pastel-on-dark span.cm-number { color: #CCCCCC; }
-.cm-s-pastel-on-dark span.cm-property { color: #8F938F; }
-.cm-s-pastel-on-dark span.cm-attribute { color: #a6e22e; }
-.cm-s-pastel-on-dark span.cm-keyword { color: #AEB2F8; }
-.cm-s-pastel-on-dark span.cm-string { color: #66A968; }
-.cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
-.cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
-.cm-s-pastel-on-dark span.cm-variable-3 { color: #DE8E30; }
-.cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
-.cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
-.cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
-.cm-s-pastel-on-dark span.cm-link { color: #ae81ff; }
-.cm-s-pastel-on-dark span.cm-qualifier,.cm-s-pastel-on-dark span.cm-builtin { color: #C1C144; }
-.cm-s-pastel-on-dark span.cm-error {
-	background: #757aD8;
-	color: #f8f8f0;
-}
-.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
-.cm-s-pastel-on-dark .CodeMirror-matchingbracket {
-	border: 1px solid rgba(255,255,255,0.25);
-	color: #8F938F !important;
-	margin: -1px -1px 0 -1px;
-}

+ 0 - 34
web/staticres/codemirror/theme/railscasts.css

@@ -1,34 +0,0 @@
-/*
-
-    Name:       Railscasts
-    Author:     Ryan Bates (http://railscasts.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-railscasts.CodeMirror {background: #2b2b2b; color: #f4f1ed;}
-.cm-s-railscasts div.CodeMirror-selected {background: #272935 !important;}
-.cm-s-railscasts .CodeMirror-gutters {background: #2b2b2b; border-right: 0px;}
-.cm-s-railscasts .CodeMirror-linenumber {color: #5a647e;}
-.cm-s-railscasts .CodeMirror-cursor {border-left: 1px solid #d4cfc9 !important;}
-
-.cm-s-railscasts span.cm-comment {color: #bc9458;}
-.cm-s-railscasts span.cm-atom {color: #b6b3eb;}
-.cm-s-railscasts span.cm-number {color: #b6b3eb;}
-
-.cm-s-railscasts span.cm-property, .cm-s-railscasts span.cm-attribute {color: #a5c261;}
-.cm-s-railscasts span.cm-keyword {color: #da4939;}
-.cm-s-railscasts span.cm-string {color: #ffc66d;}
-
-.cm-s-railscasts span.cm-variable {color: #a5c261;}
-.cm-s-railscasts span.cm-variable-2 {color: #6d9cbe;}
-.cm-s-railscasts span.cm-def {color: #cc7833;}
-.cm-s-railscasts span.cm-error {background: #da4939; color: #d4cfc9;}
-.cm-s-railscasts span.cm-bracket {color: #f4f1ed;}
-.cm-s-railscasts span.cm-tag {color: #da4939;}
-.cm-s-railscasts span.cm-link {color: #b6b3eb;}
-
-.cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }

+ 0 - 25
web/staticres/codemirror/theme/rubyblue.css

@@ -1,25 +0,0 @@
-.cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
-.cm-s-rubyblue div.CodeMirror-selected { background: #38566F; }
-.cm-s-rubyblue .CodeMirror-line::selection, .cm-s-rubyblue .CodeMirror-line > span::selection, .cm-s-rubyblue .CodeMirror-line > span > span::selection { background: rgba(56, 86, 111, 0.99); }
-.cm-s-rubyblue .CodeMirror-line::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 86, 111, 0.99); }
-.cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
-.cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
-.cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
-.cm-s-rubyblue .CodeMirror-linenumber { color: white; }
-.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
-.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
-.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
-.cm-s-rubyblue span.cm-keyword { color: #F0F; }
-.cm-s-rubyblue span.cm-string { color: #F08047; }
-.cm-s-rubyblue span.cm-meta { color: #F0F; }
-.cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
-.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
-.cm-s-rubyblue span.cm-bracket { color: #F0F; }
-.cm-s-rubyblue span.cm-link { color: #F4C20B; }
-.cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
-.cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
-.cm-s-rubyblue span.cm-error { color: #AF2018; }
-
-.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }

+ 0 - 44
web/staticres/codemirror/theme/seti.css

@@ -1,44 +0,0 @@
-/*
-
-    Name:       seti
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original seti color scheme by Jesse Weed (https://github.com/jesseweed/seti-syntax)
-
-*/
-
-
-.cm-s-seti.CodeMirror {
-  background-color: #151718 !important;
-  color: #CFD2D1 !important;
-  border: none;
-}
-.cm-s-seti .CodeMirror-gutters {
-  color: #404b53;
-  background-color: #0E1112;
-  border: none;
-}
-.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
-.cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-seti.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti span.cm-comment { color: #41535b; }
-.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 { color: #55b5db; }
-.cm-s-seti span.cm-number { color: #cd3f45; }
-.cm-s-seti span.cm-variable { color: #55b5db; }
-.cm-s-seti span.cm-variable-2 { color: #a074c4; }
-.cm-s-seti span.cm-def { color: #55b5db; }
-.cm-s-seti span.cm-keyword { color: #ff79c6; }
-.cm-s-seti span.cm-operator { color: #9fca56; }
-.cm-s-seti span.cm-keyword { color: #e6cd69; }
-.cm-s-seti span.cm-atom { color: #cd3f45; }
-.cm-s-seti span.cm-meta { color: #55b5db; }
-.cm-s-seti span.cm-tag { color: #55b5db; }
-.cm-s-seti span.cm-attribute { color: #9fca56; }
-.cm-s-seti span.cm-qualifier { color: #9fca56; }
-.cm-s-seti span.cm-property { color: #a074c4; }
-.cm-s-seti span.cm-variable-3 { color: #9fca56; }
-.cm-s-seti span.cm-builtin { color: #9fca56; }
-.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
-.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

+ 0 - 169
web/staticres/codemirror/theme/solarized.css

@@ -1,169 +0,0 @@
-/*
-Solarized theme for code-mirror
-http://ethanschoonover.com/solarized
-*/
-
-/*
-Solarized color palette
-http://ethanschoonover.com/solarized/img/solarized-palette.png
-*/
-
-.solarized.base03 { color: #002b36; }
-.solarized.base02 { color: #073642; }
-.solarized.base01 { color: #586e75; }
-.solarized.base00 { color: #657b83; }
-.solarized.base0 { color: #839496; }
-.solarized.base1 { color: #93a1a1; }
-.solarized.base2 { color: #eee8d5; }
-.solarized.base3  { color: #fdf6e3; }
-.solarized.solar-yellow  { color: #b58900; }
-.solarized.solar-orange  { color: #cb4b16; }
-.solarized.solar-red { color: #dc322f; }
-.solarized.solar-magenta { color: #d33682; }
-.solarized.solar-violet  { color: #6c71c4; }
-.solarized.solar-blue { color: #268bd2; }
-.solarized.solar-cyan { color: #2aa198; }
-.solarized.solar-green { color: #859900; }
-
-/* Color scheme for code-mirror */
-
-.cm-s-solarized {
-  line-height: 1.45em;
-  color-profile: sRGB;
-  rendering-intent: auto;
-}
-.cm-s-solarized.cm-s-dark {
-  color: #839496;
-  background-color: #002b36;
-  text-shadow: #002b36 0 1px;
-}
-.cm-s-solarized.cm-s-light {
-  background-color: #fdf6e3;
-  color: #657b83;
-  text-shadow: #eee8d5 0 1px;
-}
-
-.cm-s-solarized .CodeMirror-widget {
-  text-shadow: none;
-}
-
-.cm-s-solarized .cm-header { color: #586e75; }
-.cm-s-solarized .cm-quote { color: #93a1a1; }
-
-.cm-s-solarized .cm-keyword { color: #cb4b16; }
-.cm-s-solarized .cm-atom { color: #d33682; }
-.cm-s-solarized .cm-number { color: #d33682; }
-.cm-s-solarized .cm-def { color: #2aa198; }
-
-.cm-s-solarized .cm-variable { color: #839496; }
-.cm-s-solarized .cm-variable-2 { color: #b58900; }
-.cm-s-solarized .cm-variable-3 { color: #6c71c4; }
-
-.cm-s-solarized .cm-property { color: #2aa198; }
-.cm-s-solarized .cm-operator { color: #6c71c4; }
-
-.cm-s-solarized .cm-comment { color: #586e75; font-style:italic; }
-
-.cm-s-solarized .cm-string { color: #859900; }
-.cm-s-solarized .cm-string-2 { color: #b58900; }
-
-.cm-s-solarized .cm-meta { color: #859900; }
-.cm-s-solarized .cm-qualifier { color: #b58900; }
-.cm-s-solarized .cm-builtin { color: #d33682; }
-.cm-s-solarized .cm-bracket { color: #cb4b16; }
-.cm-s-solarized .CodeMirror-matchingbracket { color: #859900; }
-.cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
-.cm-s-solarized .cm-tag { color: #93a1a1; }
-.cm-s-solarized .cm-attribute { color: #2aa198; }
-.cm-s-solarized .cm-hr {
-  color: transparent;
-  border-top: 1px solid #586e75;
-  display: block;
-}
-.cm-s-solarized .cm-link { color: #93a1a1; cursor: pointer; }
-.cm-s-solarized .cm-special { color: #6c71c4; }
-.cm-s-solarized .cm-em {
-  color: #999;
-  text-decoration: underline;
-  text-decoration-style: dotted;
-}
-.cm-s-solarized .cm-strong { color: #eee; }
-.cm-s-solarized .cm-error,
-.cm-s-solarized .cm-invalidchar {
-  color: #586e75;
-  border-bottom: 1px dotted #dc322f;
-}
-
-.cm-s-solarized.cm-s-dark div.CodeMirror-selected { background: #073642; }
-.cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
-.cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
-
-.cm-s-solarized.cm-s-light div.CodeMirror-selected { background: #eee8d5; }
-.cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
-.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
-
-/* Editor styling */
-
-
-
-/* Little shadow on the view-port of the buffer view */
-.cm-s-solarized.CodeMirror {
-  -moz-box-shadow: inset 7px 0 12px -6px #000;
-  -webkit-box-shadow: inset 7px 0 12px -6px #000;
-  box-shadow: inset 7px 0 12px -6px #000;
-}
-
-/* Remove gutter border */
-.cm-s-solarized .CodeMirror-gutters {
-  border-right: 0;
-}
-
-/* Gutter colors and line number styling based of color scheme (dark / light) */
-
-/* Dark */
-.cm-s-solarized.cm-s-dark .CodeMirror-gutters {
-  background-color: #073642;
-}
-
-.cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
-  color: #586e75;
-  text-shadow: #021014 0 -1px;
-}
-
-/* Light */
-.cm-s-solarized.cm-s-light .CodeMirror-gutters {
-  background-color: #eee8d5;
-}
-
-.cm-s-solarized.cm-s-light .CodeMirror-linenumber {
-  color: #839496;
-}
-
-/* Common */
-.cm-s-solarized .CodeMirror-linenumber {
-  padding: 0 5px;
-}
-.cm-s-solarized .CodeMirror-guttermarker-subtle { color: #586e75; }
-.cm-s-solarized.cm-s-dark .CodeMirror-guttermarker { color: #ddd; }
-.cm-s-solarized.cm-s-light .CodeMirror-guttermarker { color: #cb4b16; }
-
-.cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
-  color: #586e75;
-}
-
-/* Cursor */
-.cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
-
-/* Fat cursor */
-.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #fdf6e3; }
-.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { background-color: #fdf6e3; }
-.cm-s-solarized.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { background: #586e75; }
-.cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { background-color: #586e75; }
-
-/* Active line */
-.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
-  background: rgba(255, 255, 255, 0.06);
-}
-.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
-  background: rgba(0, 0, 0, 0.06);
-}

+ 0 - 30
web/staticres/codemirror/theme/the-matrix.css

@@ -1,30 +0,0 @@
-.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
-.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D; }
-.cm-s-the-matrix .CodeMirror-line::selection, .cm-s-the-matrix .CodeMirror-line > span::selection, .cm-s-the-matrix .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-the-matrix .CodeMirror-line::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
-.cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
-.cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
-.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00; }
-
-.cm-s-the-matrix span.cm-keyword { color: #008803; font-weight: bold; }
-.cm-s-the-matrix span.cm-atom { color: #3FF; }
-.cm-s-the-matrix span.cm-number { color: #FFB94F; }
-.cm-s-the-matrix span.cm-def { color: #99C; }
-.cm-s-the-matrix span.cm-variable { color: #F6C; }
-.cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
-.cm-s-the-matrix span.cm-variable-3 { color: #96F; }
-.cm-s-the-matrix span.cm-property { color: #62FFA0; }
-.cm-s-the-matrix span.cm-operator { color: #999; }
-.cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
-.cm-s-the-matrix span.cm-string { color: #39C; }
-.cm-s-the-matrix span.cm-meta { color: #C9F; }
-.cm-s-the-matrix span.cm-qualifier { color: #FFF700; }
-.cm-s-the-matrix span.cm-builtin { color: #30a; }
-.cm-s-the-matrix span.cm-bracket { color: #cc7; }
-.cm-s-the-matrix span.cm-tag { color: #FFBD40; }
-.cm-s-the-matrix span.cm-attribute { color: #FFF700; }
-.cm-s-the-matrix span.cm-error { color: #FF0000; }
-
-.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }

+ 0 - 35
web/staticres/codemirror/theme/tomorrow-night-bright.css

@@ -1,35 +0,0 @@
-/*
-
-    Name:       Tomorrow Night - Bright
-    Author:     Chris Kempson
-
-    Port done by Gerard Braad <me@gbraad.nl>
-
-*/
-
-.cm-s-tomorrow-night-bright.CodeMirror { background: #000000; color: #eaeaea; }
-.cm-s-tomorrow-night-bright div.CodeMirror-selected { background: #424242; }
-.cm-s-tomorrow-night-bright .CodeMirror-gutters { background: #000000; border-right: 0px; }
-.cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
-.cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-bright .CodeMirror-linenumber { color: #424242; }
-.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
-
-.cm-s-tomorrow-night-bright span.cm-comment { color: #d27b53; }
-.cm-s-tomorrow-night-bright span.cm-atom { color: #a16a94; }
-.cm-s-tomorrow-night-bright span.cm-number { color: #a16a94; }
-
-.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute { color: #99cc99; }
-.cm-s-tomorrow-night-bright span.cm-keyword { color: #d54e53; }
-.cm-s-tomorrow-night-bright span.cm-string { color: #e7c547; }
-
-.cm-s-tomorrow-night-bright span.cm-variable { color: #b9ca4a; }
-.cm-s-tomorrow-night-bright span.cm-variable-2 { color: #7aa6da; }
-.cm-s-tomorrow-night-bright span.cm-def { color: #e78c45; }
-.cm-s-tomorrow-night-bright span.cm-bracket { color: #eaeaea; }
-.cm-s-tomorrow-night-bright span.cm-tag { color: #d54e53; }
-.cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
-.cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
-
-.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
-.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

+ 0 - 38
web/staticres/codemirror/theme/tomorrow-night-eighties.css

@@ -1,38 +0,0 @@
-/*
-
-    Name:       Tomorrow Night - Eighties
-    Author:     Chris Kempson
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-tomorrow-night-eighties.CodeMirror { background: #000000; color: #CCCCCC; }
-.cm-s-tomorrow-night-eighties div.CodeMirror-selected { background: #2D2D2D; }
-.cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-tomorrow-night-eighties .CodeMirror-gutters { background: #000000; border-right: 0px; }
-.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
-.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-eighties .CodeMirror-linenumber { color: #515151; }
-.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
-
-.cm-s-tomorrow-night-eighties span.cm-comment { color: #d27b53; }
-.cm-s-tomorrow-night-eighties span.cm-atom { color: #a16a94; }
-.cm-s-tomorrow-night-eighties span.cm-number { color: #a16a94; }
-
-.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute { color: #99cc99; }
-.cm-s-tomorrow-night-eighties span.cm-keyword { color: #f2777a; }
-.cm-s-tomorrow-night-eighties span.cm-string { color: #ffcc66; }
-
-.cm-s-tomorrow-night-eighties span.cm-variable { color: #99cc99; }
-.cm-s-tomorrow-night-eighties span.cm-variable-2 { color: #6699cc; }
-.cm-s-tomorrow-night-eighties span.cm-def { color: #f99157; }
-.cm-s-tomorrow-night-eighties span.cm-bracket { color: #CCCCCC; }
-.cm-s-tomorrow-night-eighties span.cm-tag { color: #f2777a; }
-.cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
-.cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
-
-.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
-.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

+ 0 - 64
web/staticres/codemirror/theme/ttcn.css

@@ -1,64 +0,0 @@
-.cm-s-ttcn .cm-quote { color: #090; }
-.cm-s-ttcn .cm-negative { color: #d44; }
-.cm-s-ttcn .cm-positive { color: #292; }
-.cm-s-ttcn .cm-header, .cm-strong { font-weight: bold; }
-.cm-s-ttcn .cm-em { font-style: italic; }
-.cm-s-ttcn .cm-link { text-decoration: underline; }
-.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
-.cm-s-ttcn .cm-header { color: #00f; font-weight: bold; }
-
-.cm-s-ttcn .cm-atom { color: #219; }
-.cm-s-ttcn .cm-attribute { color: #00c; }
-.cm-s-ttcn .cm-bracket { color: #997; }
-.cm-s-ttcn .cm-comment { color: #333333; }
-.cm-s-ttcn .cm-def { color: #00f; }
-.cm-s-ttcn .cm-em { font-style: italic; }
-.cm-s-ttcn .cm-error { color: #f00; }
-.cm-s-ttcn .cm-hr { color: #999; }
-.cm-s-ttcn .cm-invalidchar { color: #f00; }
-.cm-s-ttcn .cm-keyword { font-weight:bold; }
-.cm-s-ttcn .cm-link { color: #00c; text-decoration: underline; }
-.cm-s-ttcn .cm-meta { color: #555; }
-.cm-s-ttcn .cm-negative { color: #d44; }
-.cm-s-ttcn .cm-positive { color: #292; }
-.cm-s-ttcn .cm-qualifier { color: #555; }
-.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
-.cm-s-ttcn .cm-string { color: #006400; }
-.cm-s-ttcn .cm-string-2 { color: #f50; }
-.cm-s-ttcn .cm-strong { font-weight: bold; }
-.cm-s-ttcn .cm-tag { color: #170; }
-.cm-s-ttcn .cm-variable { color: #8B2252; }
-.cm-s-ttcn .cm-variable-2 { color: #05a; }
-.cm-s-ttcn .cm-variable-3 { color: #085; }
-
-.cm-s-ttcn .cm-invalidchar { color: #f00; }
-
-/* ASN */
-.cm-s-ttcn .cm-accessTypes,
-.cm-s-ttcn .cm-compareTypes { color: #27408B; }
-.cm-s-ttcn .cm-cmipVerbs { color: #8B2252; }
-.cm-s-ttcn .cm-modifier { color:#D2691E; }
-.cm-s-ttcn .cm-status { color:#8B4545; }
-.cm-s-ttcn .cm-storage { color:#A020F0; }
-.cm-s-ttcn .cm-tags { color:#006400; }
-
-/* CFG */
-.cm-s-ttcn .cm-externalCommands { color: #8B4545; font-weight:bold; }
-.cm-s-ttcn .cm-fileNCtrlMaskOptions,
-.cm-s-ttcn .cm-sectionTitle { color: #2E8B57; font-weight:bold; }
-
-/* TTCN */
-.cm-s-ttcn .cm-booleanConsts,
-.cm-s-ttcn .cm-otherConsts,
-.cm-s-ttcn .cm-verdictConsts { color: #006400; }
-.cm-s-ttcn .cm-configOps,
-.cm-s-ttcn .cm-functionOps,
-.cm-s-ttcn .cm-portOps,
-.cm-s-ttcn .cm-sutOps,
-.cm-s-ttcn .cm-timerOps,
-.cm-s-ttcn .cm-verdictOps { color: #0000FF; }
-.cm-s-ttcn .cm-preprocessor,
-.cm-s-ttcn .cm-templateMatch,
-.cm-s-ttcn .cm-ttcn3Macros { color: #27408B; }
-.cm-s-ttcn .cm-types { color: #A52A2A; font-weight:bold; }
-.cm-s-ttcn .cm-visibilityModifiers { font-weight:bold; }

+ 0 - 32
web/staticres/codemirror/theme/twilight.css

@@ -1,32 +0,0 @@
-.cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
-.cm-s-twilight div.CodeMirror-selected { background: #323232; } /**/
-.cm-s-twilight .CodeMirror-line::selection, .cm-s-twilight .CodeMirror-line > span::selection, .cm-s-twilight .CodeMirror-line > span > span::selection { background: rgba(50, 50, 50, 0.99); }
-.cm-s-twilight .CodeMirror-line::-moz-selection, .cm-s-twilight .CodeMirror-line > span::-moz-selection, .cm-s-twilight .CodeMirror-line > span > span::-moz-selection { background: rgba(50, 50, 50, 0.99); }
-
-.cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
-.cm-s-twilight .CodeMirror-guttermarker { color: white; }
-.cm-s-twilight .CodeMirror-guttermarker-subtle { color: #aaa; }
-.cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
-.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-twilight .cm-keyword { color: #f9ee98; } /**/
-.cm-s-twilight .cm-atom { color: #FC0; }
-.cm-s-twilight .cm-number { color:  #ca7841; } /**/
-.cm-s-twilight .cm-def { color: #8DA6CE; }
-.cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
-.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
-.cm-s-twilight .cm-operator { color: #cda869; } /**/
-.cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
-.cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
-.cm-s-twilight .cm-string-2 { color:#bd6b18; } /*?*/
-.cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
-.cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
-.cm-s-twilight .cm-tag { color: #997643; } /**/
-.cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
-.cm-s-twilight .cm-header { color: #FF6400; }
-.cm-s-twilight .cm-hr { color: #AEAEAE; }
-.cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
-.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
-
-.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

+ 0 - 34
web/staticres/codemirror/theme/vibrant-ink.css

@@ -1,34 +0,0 @@
-/* Taken from the popular Visual Studio Vibrant Ink Schema */
-
-.cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
-.cm-s-vibrant-ink div.CodeMirror-selected { background: #35493c; }
-.cm-s-vibrant-ink .CodeMirror-line::selection, .cm-s-vibrant-ink .CodeMirror-line > span::selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::selection { background: rgba(53, 73, 60, 0.99); }
-.cm-s-vibrant-ink .CodeMirror-line::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::-moz-selection { background: rgba(53, 73, 60, 0.99); }
-
-.cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
-.cm-s-vibrant-ink .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-vibrant-ink .cm-keyword { color: #CC7832; }
-.cm-s-vibrant-ink .cm-atom { color: #FC0; }
-.cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
-.cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
-.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D; }
-.cm-s-vibrant-ink .cm-operator { color: #888; }
-.cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
-.cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
-.cm-s-vibrant-ink .cm-string-2 { color: red; }
-.cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
-.cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-header { color: #FF6400; }
-.cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
-.cm-s-vibrant-ink .cm-link { color: blue; }
-.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
-
-.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

+ 0 - 53
web/staticres/codemirror/theme/xq-dark.css

@@ -1,53 +0,0 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort <mike@brevoort.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-xq-dark div.CodeMirror-selected { background: #27007A; }
-.cm-s-xq-dark .CodeMirror-line::selection, .cm-s-xq-dark .CodeMirror-line > span::selection, .cm-s-xq-dark .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
-.cm-s-xq-dark .CodeMirror-line::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
-.cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
-.cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-xq-dark span.cm-keyword { color: #FFBD40; }
-.cm-s-xq-dark span.cm-atom { color: #6C8CD5; }
-.cm-s-xq-dark span.cm-number { color: #164; }
-.cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
-.cm-s-xq-dark span.cm-variable { color: #FFF; }
-.cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
-.cm-s-xq-dark span.cm-variable-3 { color: #DDD; }
-.cm-s-xq-dark span.cm-property {}
-.cm-s-xq-dark span.cm-operator {}
-.cm-s-xq-dark span.cm-comment { color: gray; }
-.cm-s-xq-dark span.cm-string { color: #9FEE00; }
-.cm-s-xq-dark span.cm-meta { color: yellow; }
-.cm-s-xq-dark span.cm-qualifier { color: #FFF700; }
-.cm-s-xq-dark span.cm-builtin { color: #30a; }
-.cm-s-xq-dark span.cm-bracket { color: #cc7; }
-.cm-s-xq-dark span.cm-tag { color: #FFBD40; }
-.cm-s-xq-dark span.cm-attribute { color: #FFF700; }
-.cm-s-xq-dark span.cm-error { color: #f00; }
-
-.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

+ 0 - 43
web/staticres/codemirror/theme/xq-light.css

@@ -1,43 +0,0 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort <mike@brevoort.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-light span.cm-keyword { line-height: 1em; font-weight: bold; color: #5A5CAD; }
-.cm-s-xq-light span.cm-atom { color: #6C8CD5; }
-.cm-s-xq-light span.cm-number { color: #164; }
-.cm-s-xq-light span.cm-def { text-decoration:underline; }
-.cm-s-xq-light span.cm-variable { color: black; }
-.cm-s-xq-light span.cm-variable-2 { color:black; }
-.cm-s-xq-light span.cm-variable-3 { color: black; }
-.cm-s-xq-light span.cm-property {}
-.cm-s-xq-light span.cm-operator {}
-.cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
-.cm-s-xq-light span.cm-string { color: red; }
-.cm-s-xq-light span.cm-meta { color: yellow; }
-.cm-s-xq-light span.cm-qualifier { color: grey; }
-.cm-s-xq-light span.cm-builtin { color: #7EA656; }
-.cm-s-xq-light span.cm-bracket { color: #cc7; }
-.cm-s-xq-light span.cm-tag { color: #3F7F7F; }
-.cm-s-xq-light span.cm-attribute { color: #7F007F; }
-.cm-s-xq-light span.cm-error { color: #f00; }
-
-.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }

+ 0 - 44
web/staticres/codemirror/theme/yeti.css

@@ -1,44 +0,0 @@
-/*
-
-    Name:       yeti
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original yeti color scheme by Jesse Weed (https://github.com/jesseweed/yeti-syntax)
-
-*/
-
-
-.cm-s-yeti.CodeMirror {
-  background-color: #ECEAE8 !important;
-  color: #d1c9c0 !important;
-  border: none;
-}
-
-.cm-s-yeti .CodeMirror-gutters {
-  color: #adaba6;
-  background-color: #E5E1DB;
-  border: none;
-}
-.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0; }
-.cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
-.cm-s-yeti.CodeMirror-focused div.CodeMirror-selected { background: #DCD8D2; }
-.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
-.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection { background: #DCD8D2; }
-.cm-s-yeti span.cm-comment { color: #d4c8be; }
-.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 { color: #96c0d8; }
-.cm-s-yeti span.cm-number { color: #a074c4; }
-.cm-s-yeti span.cm-variable { color: #55b5db; }
-.cm-s-yeti span.cm-variable-2 { color: #a074c4; }
-.cm-s-yeti span.cm-def { color: #55b5db; }
-.cm-s-yeti span.cm-operator { color: #9fb96e; }
-.cm-s-yeti span.cm-keyword { color: #9fb96e; }
-.cm-s-yeti span.cm-atom { color: #a074c4; }
-.cm-s-yeti span.cm-meta { color: #96c0d8; }
-.cm-s-yeti span.cm-tag { color: #96c0d8; }
-.cm-s-yeti span.cm-attribute { color: #9fb96e; }
-.cm-s-yeti span.cm-qualifier { color: #96c0d8; }
-.cm-s-yeti span.cm-property { color: #a074c4; }
-.cm-s-yeti span.cm-builtin { color: #a074c4; }
-.cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
-.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
-.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }

Some files were not shown because too many files changed in this diff