diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/LICENSE.txt b/LICENSE.txt old mode 100755 new mode 100644 diff --git a/angular-seed/app/css/app.css b/angular-seed/app/css/app.css old mode 100755 new mode 100644 index 7a015a0..6bc3642 --- a/angular-seed/app/css/app.css +++ b/angular-seed/app/css/app.css @@ -61,8 +61,7 @@ .params .CodeMirror { height: auto; - max-height: 300px; - overflow-y: auto; + min-height: 50px; } .source .CodeMirror { @@ -76,9 +75,12 @@ } .template_error { - background-color: #F2DEDE; - color: #B94A48; - border-color: #EED3D7; + background-color: #000; + color: #F04441; + border-color: #000; +} +#RESULT_PANEL code, #RESULT_PANEL pre { + font-family: "Source Code Pro Semibold","Envy Code R",Consolas, Monaco, Menlo, 'Courier New', monospace; } .file_active { diff --git a/angular-seed/app/embed.html b/angular-seed/app/embed.html old mode 100755 new mode 100644 index 4da1760..bbc889d --- a/angular-seed/app/embed.html +++ b/angular-seed/app/embed.html @@ -36,7 +36,7 @@ .embedded .nav.nav-tabs li a {border: none;border-radius: 0;background: transparent;} .embedded .nav.nav-tabs li:not(.active) a:hover {text-decoration: underline;} .embedded form {margin-bottom: 1px;} - .embedded form .toolbar {margin-top: 5px;} + .embedded form .toolbar {margin-top: 5px;position: absolute;right:0;} .embedded .edit_panel input {border-radius: 0;} .embedded .btn {border-radius: 0;background-image: none;} .embedded .slight-buttons .btn {background: transparent;border-color: #fff;border-image: none;margin-bottom: -2px;opacity: .5;} @@ -136,7 +136,7 @@ var $_ = $(this).find('.tag.lbl'); $_.html($_.data('label')).animate({opacity: 0.7}, 400); } - }, '.source .CodeMirror, .params .CodeMirror, #RESULT_PANEL div.result') + }, '.source .CodeMirror, .params .CodeMirror, #RESULT_PANEL div.result'); }); setInterval(function(){ if ($('.source .CodeMirror .tag.lbl').size() > 0) return; diff --git a/angular-seed/app/index-async.html b/angular-seed/app/index-async.html old mode 100755 new mode 100644 diff --git a/angular-seed/app/index.html b/angular-seed/app/index.html old mode 100755 new mode 100644 index d78be66..11b7f0c --- a/angular-seed/app/index.html +++ b/angular-seed/app/index.html @@ -52,10 +52,14 @@
  • About
    • - -

    Logged in as {{current}}

    - Admin Login -     + @@ -113,7 +117,12 @@ }, '.source .CodeMirror, .params .CodeMirror, #RESULT_PANEL div.result') var wh = $(window).height(); setInterval(function(){ - $('.source .CodeMirror').animate({'height': (wh - 220) + 'px'}); + var h = wh - 220; + $('.source .CodeMirror').animate({'height': h + 'px'}); + var ph = $('.params .CodeMirror').height(); + if (ph > h / 2) { + $('.params .CodeMirror').animate({height: (h / 2) + 'px'}); + } }, 1000); }); setInterval(function(){ diff --git a/angular-seed/app/js/controllers.js b/angular-seed/app/js/controllers.js old mode 100755 new mode 100644 index 2f7f977..41c91ab --- a/angular-seed/app/js/controllers.js +++ b/angular-seed/app/js/controllers.js @@ -59,16 +59,43 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { $scope.switchFile = switchFile; $scope.removeFile = removeFile; $scope.setMain = setMain; - $scope.editFileName = editFileName; - $scope.cancelEditFileName = cancelEditFileName; + $scope.renameFile = renameFile; + $scope.cancelRenameFile = cancelRenameFile; $scope.getActiveFile = getActiveFile; $scope.getMainFile = getMainFile; $scope.keyEventHandlerForCodeMirror = keyEventHandlerForCodeMirror; + $scope.ta = { + $source: function() {return $('.source textarea');}, + $params: function() {return $('.params textarea');} + }; + $scope.$focus = false; + $scope.storeCurFocus = function(){ + $scope.$focus = $scope.ta.$source; + var $p = $scope.ta.$params(); + if ($p.is(":focus")) { + $scope.$focus = $scope.ta.$params; + } + }; + $scope.restoreFocus = function() { + setTimeout(function(){ + if ($scope.$focus) { + $scope.$focus().focus(); + } else { + $('.source textarea').focus(); + } + },1); + } function keyEventHandlerForCodeMirror($event) { var keyCode = $event.keyCode; if (keyCode === 10 || keyCode == 13 && $event.ctrlKey) { run(); + } else if (keyCode == 84 && $event.ctrlKey && $event.altKey) /*ctrl-al-t*/ { +// var $t = $scope.ta.$source(), $p = $scope.ta.$params(); +// if ($t.is(':focus')) $p.focus(); +// else $t.focus(); + } else if (keyCode == 113 /*F2*/) { + renameFile(); } } @@ -108,6 +135,7 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { } function setMain(file) { + if (!file) file = getActiveFile(); _.each($scope.currentCode.files, function (file) { file.isMain = false; }); @@ -122,6 +150,7 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { } function removeFile(file, noAlert) { + if (!file) file = getActiveFile(); if ($scope.currentCode.files.length > 1) { if (noAlert || confirm('Delete this template?')) { $scope.currentCode.files = _.without($scope.currentCode.files, file); @@ -140,6 +169,8 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { // 1. not null // 2. unique function saveFileName(file) { + if (!file) file = getActiveFile(); + if (!file) return; var editName = file.editName; if (!editName) { alert('filename should not be empty'); @@ -156,20 +187,25 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { file.filename = editName; file.editing = false; } + $scope.restoreFocus(); } - function editFileName(file) { + function renameFile(file) { + $scope.storeCurFocus(); + if (!file) file = getActiveFile(); file.editName = file.filename; file.editing = !file.editing; } - function cancelEditFileName(file) { + function cancelRenameFile(file) { + if (!file) file = getActiveFile(); if (!file.filename) { removeFile(file, true); return; } file.editName = null; file.editing = false; + $scope.restoreFocus(); } function removeCurrentCode() { @@ -209,7 +245,7 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { } function run() { - if ($scope.currentCode.files.length > 0) { + if ($scope.currentCode.files.length > 0) { if ($scope.running) return; $scope.running = true; $scope.resultPageActive = true; @@ -246,7 +282,6 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { newOne.isMain = true; } } - } EditorCtrl.$inject = ['$scope', '$http', '$routeParams', '$dialog', '$location', '$timeout']; @@ -262,10 +297,12 @@ function SaveDialogCtrl($scope, dialog, code, $http, saveAsNew) { } $http.post('/api/Application/save', code).success(function (code) { dialog.close(code); + //TODO: $scope.run(); }).error(function (data) { - alert(data); - }); + alert(data); + }); } + } SaveDialogCtrl.$inject = ['$scope', 'dialog', 'code', '$http', 'saveAsNew']; diff --git a/angular-seed/app/js/filters.js b/angular-seed/app/js/filters.js old mode 100755 new mode 100644 index 927bc40..36fa19a --- a/angular-seed/app/js/filters.js +++ b/angular-seed/app/js/filters.js @@ -23,7 +23,7 @@ angular.module('myApp.filters', []). } function safe_tags_replace(str) { - return str.replace(/[&<>]/g, replaceTag); + return str ? str.replace(/[&<>]/g, replaceTag) : ""; } return safe_tags_replace(str); diff --git a/angular-seed/app/partials/about.html b/angular-seed/app/partials/about.html old mode 100755 new mode 100644 index cd21fce..4efb33c --- a/angular-seed/app/partials/about.html +++ b/angular-seed/app/partials/about.html @@ -3,12 +3,24 @@

    Rythm Fiddle

    -

    Rythm Fiddle is created by Freewind +

    Rythm Fiddle is brought to you by Freewind and Green

    Fork me: https://github.com/freewind/rythmfiddle

    -

    License: Apache 2

    +

    License: Apache License, Version 2

    + +

    Use "messages.xx" or "msg.xx" or "m.xx" to name resource files if you need i18n

    + +

    Shortcut keys

    +
    Close diff --git a/angular-seed/app/partials/editor.html b/angular-seed/app/partials/editor.html old mode 100755 new mode 100644 index 3a7ef03..d86e1b4 --- a/angular-seed/app/partials/editor.html +++ b/angular-seed/app/partials/editor.html @@ -22,12 +22,12 @@
    -
    - - Compact View - -
    + + + + + +
    @@ -61,13 +61,13 @@ - + - + - @@ -80,11 +80,11 @@
    - - - + @@ -96,9 +96,11 @@
    -
    @@ -112,7 +114,7 @@
    @@ -131,9 +133,34 @@ diff --git a/angular-seed/app/partials/embed.html b/angular-seed/app/partials/embed.html old mode 100755 new mode 100644 index 5f8b3e5..4f2f898 --- a/angular-seed/app/partials/embed.html +++ b/angular-seed/app/partials/embed.html @@ -2,6 +2,12 @@
    + + View in Fiddle + + + + diff --git a/angular-seed/app/partials/save_dialog.html b/angular-seed/app/partials/save_dialog.html old mode 100755 new mode 100644 index 1ce5b18..8547b97 --- a/angular-seed/app/partials/save_dialog.html +++ b/angular-seed/app/partials/save_dialog.html @@ -4,7 +4,7 @@
    - +
    diff --git a/app/common/Helper.java b/app/common/Helper.java old mode 100755 new mode 100644 index a8d7700..d9e11f1 --- a/app/common/Helper.java +++ b/app/common/Helper.java @@ -1,7 +1,7 @@ package common; import com.google.gson.Gson; -import com.greenlaw110.rythm.utils.S; +import org.rythmengine.utils.S; import models.Code; import java.util.HashMap; diff --git a/app/controllers/Application.java b/app/controllers/Application.java old mode 100755 new mode 100644 index 70c7a47..7678f7b --- a/app/controllers/Application.java +++ b/app/controllers/Application.java @@ -1,7 +1,7 @@ package controllers; import com.google.gson.Gson; -import com.greenlaw110.rythm.utils.S; +import org.rythmengine.utils.S; import common.CodeManager; import common.Helper; import models.Code; diff --git a/app/demo/Bar.java b/app/demo/Bar.java old mode 100755 new mode 100644 index 6e5048b..527840d --- a/app/demo/Bar.java +++ b/app/demo/Bar.java @@ -1,7 +1,5 @@ package demo; -import com.greenlaw110.rythm.play.RythmPlugin; - import java.util.UUID; public class Bar { @@ -19,6 +17,6 @@ public Bar(String id) { } public String toString() { - return RythmPlugin.substitute("Bar[@1]", id); + return String.format("Bar[%s]", id); } } diff --git a/app/demo/Foo.java b/app/demo/Foo.java old mode 100755 new mode 100644 index c8ecd1e..30ea4e0 --- a/app/demo/Foo.java +++ b/app/demo/Foo.java @@ -1,7 +1,5 @@ package demo; -import com.greenlaw110.rythm.play.RythmPlugin; - public class Foo { public Bar bar; @@ -18,6 +16,6 @@ public Foo(String barId) { } public String toString() { - return RythmPlugin.substitute("Foo[@1]", bar); + return String.format("Foo[%s]", bar); } } diff --git a/app/demo/Order.java b/app/demo/Order.java old mode 100755 new mode 100644 index 33c6f9f..a57b0d1 --- a/app/demo/Order.java +++ b/app/demo/Order.java @@ -1,8 +1,8 @@ package demo; -import com.greenlaw110.rythm.extension.Transformer; -import com.greenlaw110.rythm.template.ITemplate; -import com.greenlaw110.rythm.utils.S; +import org.rythmengine.extension.Transformer; +import org.rythmengine.template.ITemplate; +import org.rythmengine.utils.S; public class Order { public String getId() { diff --git a/app/demo/User.java b/app/demo/User.java old mode 100755 new mode 100644 index db3e6e6..8fb5261 --- a/app/demo/User.java +++ b/app/demo/User.java @@ -1,8 +1,8 @@ package demo; import com.alibaba.fastjson.JSON; -import com.greenlaw110.rythm.play.RythmPlugin; -import com.greenlaw110.rythm.utils.JSONWrapper; +import org.rythmengine.play.RythmPlugin; +import org.rythmengine.utils.JSONWrapper; public class User { private String username; diff --git a/app/jobs/InitJobs.java b/app/jobs/InitJobs.java old mode 100755 new mode 100644 index 269d748..0e41d48 --- a/app/jobs/InitJobs.java +++ b/app/jobs/InitJobs.java @@ -1,8 +1,14 @@ package jobs; import common.CodeManager; +import demo.Bar; +import demo.Foo; +import demo.Order; +import demo.User; +import org.rythmengine.logger.Logger; import play.jobs.Job; import play.jobs.OnApplicationStart; +import org.rythmengine.play.RythmPlugin; /** * User: freewind @@ -19,6 +25,17 @@ public class InitJobs extends Job { public void doJob() throws Exception { CodeManager.CODE_ROOT.mkdirs(); CodeManager.reload(); + loadModelClassesBeforeHand(); //Code.initRythmEngine(); } + + private void loadModelClassesBeforeHand() { + new Bar(); + new Foo(); + new Order(); + new User(); + RythmPlugin.render("@args demo.Bar bar, demo.Foo foo, demo.Order order, demo.User user"); + Logger.info("model classes loaded"); + } + } diff --git a/app/models/Code.java b/app/models/Code.java old mode 100755 new mode 100644 index b2e22ed..e9894e6 --- a/app/models/Code.java +++ b/app/models/Code.java @@ -1,20 +1,23 @@ package models; +import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.greenlaw110.rythm.Rythm; -import com.greenlaw110.rythm.RythmEngine; -import com.greenlaw110.rythm.extension.ICodeType; -import com.greenlaw110.rythm.extension.ISourceCodeEnhancer; -import com.greenlaw110.rythm.play.RythmPlugin; -import com.greenlaw110.rythm.sandbox.RythmSecurityManager; -import com.greenlaw110.rythm.sandbox.SandboxThreadFactory; -import com.greenlaw110.rythm.template.ITemplate; -import com.greenlaw110.rythm.utils.JSONWrapper; -import com.greenlaw110.rythm.utils.S; import demo.Order; +import org.rythmengine.Rythm; +import org.rythmengine.RythmEngine; +import org.rythmengine.extension.ICodeType; +import org.rythmengine.extension.ISourceCodeEnhancer; +import org.rythmengine.logger.Logger; +import org.rythmengine.play.RythmPlugin; +import org.rythmengine.template.ITemplate; +import org.rythmengine.utils.F; +import org.rythmengine.utils.JSONWrapper; +import org.rythmengine.utils.S; +import play.jobs.Every; import play.mvc.Scope; import java.io.IOException; +import java.io.Serializable; import java.util.*; import static common.Helper.eq; @@ -24,7 +27,7 @@ * Date: 13-3-18 * Time: 下午6:07 */ -public class Code { +public class Code implements Serializable { public String id; public String desc; @@ -38,55 +41,64 @@ public boolean isNew() { private static final Object lock = new Object(); - private static final Map engines = new HashMap(); + private static final Map> engines = new HashMap>(); + + private Properties _conf(Properties userConf, String sessId) { + Properties conf = new Properties(); + if (null != userConf) conf.putAll(userConf); + conf.put("resource.loader", new InMemoryResourceLoader(sessId)); + conf.put("default.code_type", ICodeType.DefImpl.HTML); + conf.put("engine.mode", Rythm.Mode.dev); + conf.put("cache.prod_only.enabled", false); + RythmEngine playRE = RythmPlugin.engine; + conf.put("engine.class_loader.parent", playRE.classLoader().getParent()); + conf.put("engine.class_loader.byte_code_helper", playRE.conf().byteCodeHelper()); + conf.put("sandbox.allowed_system_properties", "java.io.tmpdir,file.encoding,user.dir,line.separator,java.vm.name,java.protocol.handler.pkgs,suppressRawWhenUnchecked,tolerateIllegalAmbiguousVarargsInvocation"); + conf.put("engine.playframework.enabled", true); + conf.put("codegen.source_code_enhancer", new ISourceCodeEnhancer() { + @Override + public List imports() { + List l = new ArrayList(); + l.add("demo.*"); + return l; + } + + @Override + public String sourceCode() { + return null; + } - private static final String sandboxPassword = UUID.randomUUID().toString(); - private static final RythmSecurityManager rsm = new RythmSecurityManager(null, sandboxPassword, null); - private static final SandboxThreadFactory stf = new SandboxThreadFactory(rsm, sandboxPassword, null); + @Override + public Map getRenderArgDescriptions() { + return Collections.EMPTY_MAP; + } + + @Override + public void setRenderArgs(ITemplate template) { + } + }); + conf.put("rythm.i18n.message.resolver", new InMemoryMessageResolver(sessId)); + //conf.put("log.source.java.enabled", false); + //conf.put("log.source.template.enabled", false); + return conf; + } - private RythmEngine engine() { - String sessId = Scope.Session.current().getId(); + private RythmEngine engine(Properties p) { + final Scope.Session sess = Scope.Session.current(); + final String sessId = sess.getId(); + Properties conf = _conf(p, sessId); + String userConf = null == p ? "" : p.toString(); synchronized (lock) { - RythmEngine e = engines.get(sessId); - if (null == e) { - Map conf = new HashMap(); - conf.put("resource.loader", new InMemoryResourceLoader(sessId)); - conf.put("default.code_type", ICodeType.DefImpl.HTML); - conf.put("engine.mode", Rythm.Mode.dev); - conf.put("sandbox.security_manager", rsm); - conf.put("sandbox.thread_factory", stf); - RythmEngine playRE = RythmPlugin.engine; - conf.put("engine.class_loader.parent", playRE.classLoader().getParent()); - conf.put("engine.class_loader.bytecode_helper", playRE.conf().byteCodeHelper()); - conf.put("sandbox.allowed_system_properties", "java.io.tmpdir,file.encoding,user.dir,line.separator,java.vm.name,java.protocol.handler.pkgs,suppressRawWhenUnchecked"); - conf.put("codegen.source_code_enhancer", new ISourceCodeEnhancer() { - @Override - public List imports() { - List l = new ArrayList(); - l.add("demo.*"); - return l; - } - - @Override - public String sourceCode() { - return null; - } - - @Override - public Map getRenderArgDescriptions() { - return Collections.EMPTY_MAP; - } - - @Override - public void setRenderArgs(ITemplate template) { - } - }); - //conf.put("log.source.java.enabled", false); - //conf.put("log.source.template.enabled", false); + F.T2 t2 = engines.get(sessId + userConf); + RythmEngine e; + if (t2 == null) { e = new RythmEngine(conf); + Logger.info(">>>>>>>>>>Cache enabled: %s", e.conf().cacheEnabled()); e.registerTransformer(Order.class); - engines.put(sessId, e); + } else { + e = t2._1; } + engines.put(sessId + userConf, F.T2(e, System.currentTimeMillis())); return e; } } @@ -96,9 +108,19 @@ public String render() throws IOException { // FIXME? Is it correct to use a file? (which will make rythm use FileTemplateResource) Map context = new HashMap(); context.put("session-id", Scope.Session.current().getId()); - RythmEngine rythm = engine(); + JSONWrapper json = S.empty(params) ? null : JSONWrapper.wrap(params); + Map map = null == json ? null : json.getObject(); + Properties p = null; + if (null != map && map.containsKey("_conf")) { + JSONObject o = (JSONObject)map.get("_conf"); + p = new Properties(); + for (String k : o.keySet()) { + p.put(k, o.get(k)); + } + } + RythmEngine rythm = engine(p); if (S.notEmpty(params)) { - return rythm.sandbox(context).render(main.getKey(), JSONWrapper.wrap(params)); + return rythm.sandbox(context).render(main.getKey(), json); } else { return rythm.sandbox(context).render(main.getKey()); } @@ -137,6 +159,23 @@ public void save(String sessionId) { for (CodeFile file : files) { file.save(sessionId); } + InMemoryMessageResolver.save(this, sessionId); + } + + @Every("10mn") + public static class SessionCleaner extends play.jobs.Job { + @Override + public void doJob() throws Exception { + List toBeRemoved = new ArrayList(); + for (String sessId : engines.keySet()) { + F.T2 t2 = engines.get(sessId); + if ((t2._2 + 1000 * 60 * 5) < System.currentTimeMillis()) toBeRemoved.add(sessId); + } + for (String sessId : toBeRemoved) { + engines.remove(sessId); + } + } } + } diff --git a/app/models/CodeFile.java b/app/models/CodeFile.java old mode 100755 new mode 100644 index 19c74dc..58dd3f2 --- a/app/models/CodeFile.java +++ b/app/models/CodeFile.java @@ -1,11 +1,11 @@ package models; -import com.greenlaw110.rythm.RythmEngine; -import com.greenlaw110.rythm.extension.ICodeType; -import com.greenlaw110.rythm.logger.Logger; -import com.greenlaw110.rythm.resource.ITemplateResource; -import com.greenlaw110.rythm.resource.TemplateResourceBase; -import com.greenlaw110.rythm.utils.S; +import org.rythmengine.RythmEngine; +import org.rythmengine.extension.ICodeType; +import org.rythmengine.extension.ITemplateResourceLoader; +import org.rythmengine.resource.ITemplateResource; +import org.rythmengine.resource.TemplateResourceBase; +import org.rythmengine.utils.S; public class CodeFile implements ITemplateResource { public String filename; @@ -13,8 +13,11 @@ public class CodeFile implements ITemplateResource { public boolean isMain; public String tagName; public String sessionId; - private RythmEngine engine; + + public CodeFile () { + } + @Override public String getKey() { if (filename.startsWith("/")) return filename; @@ -32,8 +35,8 @@ public String asTemplateContent() { } @Override - public void setEngine(RythmEngine engine) { - this.engine = engine; + public ITemplateResourceLoader getLoader() { + return null; //To change body of implemented methods use File | Settings | File Templates. } @Override @@ -43,7 +46,6 @@ public boolean refresh() { source = cf.source; return true; } - Logger.error(">>>>>>>> not changed <<<<<<<<"); return false; } @@ -52,32 +54,24 @@ public boolean isValid() { return true; } - @Override - public String tagName() { - if (null == tagName) { - this.tagName = getFullTagName(getKey()); - } - return tagName; - } - private static String getFullTagName(String key) { if (key.startsWith("/")) key = key.substring(1); - int pos = key.lastIndexOf("."); - if (-1 != pos) key = key.substring(0, pos); +// int pos = key.lastIndexOf("."); +// if (-1 != pos) key = key.substring(0, pos); return key.replace('/', '.'); } private ICodeType type = null; + @Override - public ICodeType codeType() { - if (null == type) { - RythmEngine engine = RythmEngine.get(); + public ICodeType codeType(RythmEngine engine) { + if (null == type) { + //RythmEngine engine = RythmEngine.get(); type = TemplateResourceBase.getTypeOfPath(engine, getKey()); } - return type; } - + public void save(String sessionId) { this.sessionId = sessionId; InMemoryResourceLoader.save(getKey(), sessionId, this); @@ -86,7 +80,7 @@ public void save(String sessionId) { public boolean equals(Object that) { if (this == that) return true; if (that instanceof CodeFile) { - CodeFile cf = (CodeFile)that; + CodeFile cf = (CodeFile) that; return cf.getKey().equals(this.getKey()) && S.eq(cf.sessionId, this.sessionId) && cf.source.equals(this.source); } else { return false; diff --git a/app/models/InMemoryMessageResolver.java b/app/models/InMemoryMessageResolver.java new file mode 100644 index 0000000..fcd866f --- /dev/null +++ b/app/models/InMemoryMessageResolver.java @@ -0,0 +1,112 @@ +package models; + +import org.rythmengine.extension.II18nMessageResolver; +import org.rythmengine.template.ITemplate; +import org.rythmengine.utils.I18N; +import play.cache.Cache; + +import java.io.IOException; +import java.io.StringReader; +import java.text.MessageFormat; +import java.util.Locale; +import java.util.Properties; + +/** + * Created with IntelliJ IDEA. + * User: luog + * Date: 7/04/13 + * Time: 9:06 PM + * To change this template use File | Settings | File Templates. + */ +public class InMemoryMessageResolver extends InMemoryResourceLoader implements II18nMessageResolver { + + public InMemoryMessageResolver(String sessionId) { + super(sessionId); + } + + public static final String CACHE_KEY = "__FIDDLE_CODE__"; + + public static void save(Code code, String sessionId) { + Cache.set(key(CACHE_KEY, sessionId), code); + } + + private String _msg(ITemplate template, Locale locale, CodeFile cf, String key, Object... args) { + String res = cf.asTemplateContent(); + Properties p = new Properties(); + try { + p.load(new StringReader(res)); + } catch (IOException e) { + throw new RuntimeException(e); + } + String s = p.getProperty(key); + if (null == s) return null; + int argLen = args.length; + if (argLen > 0) { + MessageFormat fmt = new MessageFormat(s, locale); + Object[] argsResolved = new Object[argLen]; + for (int i = 0; i < argLen; ++i) { + Object arg = args[i]; + if (arg instanceof String) { + arg = getMessage(template, (String) arg); + } + argsResolved[i] = arg; + } + return fmt.format(argsResolved); + } else { + return s; + } + } + + @Override + public String getMessage(ITemplate template, String key, Object... args) { + boolean useFormat = args.length > 0; + Locale locale = null; + if (useFormat) { + // check if the first arg is locale + Object arg0 = args[0]; + if (arg0 instanceof Locale) { + locale = (Locale)arg0; + Object[] args0 = new Object[args.length - 1]; + System.arraycopy(args, 1, args0, 0, args.length - 1); + args = args0; + } + } + if (null == locale) locale = I18N.locale(template); + + Code code = Cache.get(key(CACHE_KEY, sessionId), Code.class); + for (CodeFile cf: code.files) { + String fn0 = cf.filename; + if (fn0.startsWith("messages.") || fn0.startsWith("msg.") || fn0.startsWith("m.")) { + String s = locale.toString(); + while(true) { + String retVal = null, fn = null; + if (fn0.startsWith("messages.")) fn = "messages." + s; + else if (fn0.startsWith("msg.")) fn = "msg." + s; + else fn = "m." + s; + if (cf.filename.startsWith(fn)) { + retVal = _msg(template, locale, cf, key, args); + if (null != retVal) return retVal; + } + int pos = fn.lastIndexOf('_'); + if (pos == -1) break; + // get off locale variant and try + fn = fn.substring(0, pos); + if (cf.filename.startsWith(fn)) { + retVal = _msg(template, locale, cf, key, args); + if (null != retVal) return retVal; + } + pos = fn.lastIndexOf('_'); + if (pos == -1) break; + // get rid of locale country code and try again + fn = fn.substring(0, pos); + if (cf.filename.startsWith(fn)) { + retVal = _msg(template, locale, cf, key, args); + if (null != retVal) return retVal; + } + break; + } + } + } + return key; + } +} diff --git a/app/models/InMemoryResourceLoader.java b/app/models/InMemoryResourceLoader.java old mode 100755 new mode 100644 index 26f9069..645f7ec --- a/app/models/InMemoryResourceLoader.java +++ b/app/models/InMemoryResourceLoader.java @@ -1,18 +1,9 @@ package models; -import com.greenlaw110.rythm.Rythm; -import com.greenlaw110.rythm.RythmEngine; -import com.greenlaw110.rythm.extension.ICodeType; -import com.greenlaw110.rythm.internal.compiler.TemplateClass; -import com.greenlaw110.rythm.resource.*; -import com.greenlaw110.rythm.utils.S; +import org.rythmengine.logger.Logger; +import org.rythmengine.resource.ResourceLoaderBase; import play.cache.Cache; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * Created with IntelliJ IDEA. * User: luog @@ -20,7 +11,7 @@ * Time: 1:09 PM * To change this template use File | Settings | File Templates. */ -public class InMemoryResourceLoader implements ITemplateResourceLoader { +public class InMemoryResourceLoader extends ResourceLoaderBase { public final String sessionId; @@ -29,14 +20,23 @@ public InMemoryResourceLoader(String sessionId) { } public static void save(String path, String sessionId, CodeFile file) { - Cache.set(key(path, sessionId), file); + String k = key(path, sessionId); + Logger.info("save %s", k); + Cache.set(k, file); } public static CodeFile load(String path, String sessionId) { - return (CodeFile)Cache.get(key(path, sessionId)); + String k = key(path, sessionId); + CodeFile cf = (CodeFile) Cache.get(k); + if (cf != null) { + Logger.info("load %s: success", k); + } else { + if (!path.startsWith("/")) return load("/" + path, sessionId); + } + return cf; } - private static String key(String path, String sessionId) { + protected static String key(String path, String sessionId) { return sessionId + "://" + path; } @@ -45,127 +45,8 @@ public CodeFile load(String path) { return load(path, sessionId); } - public TemplateClass tryLoadTemplate(String tmplName, RythmEngine engine, TemplateClass callerClass) { - return tryLoadTemplate(tmplName, engine, callerClass, true); - } - - private TemplateClass tryLoadTemplate(String tmplName, RythmEngine engine, TemplateClass callerClass, boolean processTagName) { - if (null == engine) engine = Rythm.engine(); - if (engine.templateRegistered(tmplName)) return null; - String rythmSuffix = engine.conf().resourceNameSuffix(); - final List suffixes = new ArrayList(Arrays.asList(new String[]{ - ".html", - ".json", - ".js", - ".css", - ".csv", - ".xml", - ".txt", - "" - })); - ICodeType codeType = TemplateResourceBase.getTypeOfPath(engine, tmplName); - if (ICodeType.DefImpl.RAW == codeType) { - // use caller's code type - codeType = callerClass.codeType; - } - final String tagNameOrigin = tmplName; - if (processTagName) { - boolean tagNameProcessed = false; - while (!tagNameProcessed) { - // process tagName to remove suffixes - // 1. check without rythm-suffix - for (String s : suffixes) { - if (tmplName.endsWith(s)) { - tmplName = tmplName.substring(0, tmplName.lastIndexOf(s)); - break; - } - } - if (S.notEmpty(rythmSuffix)) { - // 2. check with rythm-suffix - for (String s : suffixes) { - s = s + rythmSuffix; - if (tmplName.endsWith(s)) { - tmplName = tmplName.substring(0, tmplName.lastIndexOf(s)); - break; - } - } - } - tagNameProcessed = true; - } - } - tmplName = tmplName.replace('.', '/'); - String sfx = codeType.resourceNameSuffix(); - if (S.notEmpty(sfx) && !suffixes.get(0).equals(sfx)) { - suffixes.remove(sfx); - suffixes.add(0, sfx); - } - CodeFile tagFile; - List roots = new ArrayList(); - roots.add(""); - - // call tag with import path - if (null != callerClass.importPaths) { - for (String s : callerClass.importPaths) { - roots.add(s.replace('.', '/')); - } - } - - final String tagName0 = tmplName; - // call tag using relative path - String currentPath = callerClass.getKey().toString(); - int pos = currentPath.lastIndexOf("/"); - if (-1 == pos) { - pos = currentPath.lastIndexOf(File.separator); - } - if (-1 != pos) { - currentPath = currentPath.substring(0, pos); - if (currentPath.startsWith("/") || currentPath.startsWith(File.separator)) - currentPath = currentPath.substring(1); - roots.add(currentPath); - } - - for (String r : roots) { - tmplName = r + '/' + tagName0; - for (String suffix : suffixes) { - String name = tmplName + suffix + rythmSuffix; - - tagFile = load(name); - ITemplateResource tr = tagFile; - if (null != tr) { -// try { - TemplateClass tc = engine.classes().getByTemplate(tr.getKey()); - if (null == tc) { - tc = new TemplateClass(tr, engine); - } - try { - tc.asTemplate(); // register the template - return tc; -// ITemplate t = tc.asTemplate(); -// if (null != t) { -// String fullName = getFullTagName(tc, engine); -// tc.setFullName(fullName); -// engine.registerTemplate(fullName, t); -// return tc; -// } - } catch (Exception e) { - return tc; - } -// } catch (Exception e) { -// // ignore -// } - } - } - } - return processTagName ? tryLoadTemplate(tagNameOrigin, engine, callerClass, false) : null; - } - - @Override - public String getFullName(TemplateClass tc, RythmEngine engine) { - return FileTemplateResource.getFullTagName(tc, engine); - } - @Override - public void scan(String root, TemplateResourceManager manager) { - //To change body of implemented methods use File | Settings | File Templates. + public String getResourceLoaderRoot() { + return ""; } } diff --git a/conf/application.conf b/conf/application.conf old mode 100755 new mode 100644 index a983f86..8addd7b --- a/conf/application.conf +++ b/conf/application.conf @@ -29,7 +29,7 @@ date.format=yyyy-MM-dd # Server configuration # ~~~~~ # If you need to change the HTTP port, uncomment this (default is set to 9000) -# http.port=9000 +http.port=8080 # # By default the server listen for HTTP on the wilcard address. # You can restrict this. @@ -69,7 +69,7 @@ date.format=yyyy-MM-dd # ~~~~~ # Specify log level for your application. # If you want a very customized log, create a log4j.properties file in the conf directory -# application.log=INFO +application.log=DEBUG # # More logging configuration # application.log.path=/log4j.properties diff --git a/conf/dependencies.yml b/conf/dependencies.yml old mode 100755 new mode 100644 index 30df5e7..2b175c6 --- a/conf/dependencies.yml +++ b/conf/dependencies.yml @@ -2,9 +2,8 @@ require: - play -# - com.greenlaw110.rythm -> rythm-engine 1.0-b5 - - com.gelinsoft -> play-rythm 1.0-b5s - - com.gelinsoft -> app-base 1.5.0 + - com.gelinsoft -> play-rythm 1.0.1-b2 + - com.gelinsoft -> app-base 2.1.3 - com.gelinsoft -> betterlogs 1.2i repositories: diff --git a/public/codemirror-rythm-mixed.js b/public/codemirror-rythm-mixed.js new file mode 100644 index 0000000..f9a2e4a --- /dev/null +++ b/public/codemirror-rythm-mixed.js @@ -0,0 +1,105 @@ +CodeMirror.defineMode("rythmmixed", function(config, parserConfig) { + var rythmMode = CodeMirror.getMode(config, {name: "rythm"}); + var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true}); + var cssMode = CodeMirror.getMode(config, "css"); + + var scriptTypes = [], scriptTypesConf = parserConfig && parserConfig.scriptTypes; + scriptTypes.push({matches: /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, + mode: CodeMirror.getMode(config, "javascript")}); + if (scriptTypesConf) for (var i = 0; i < scriptTypesConf.length; ++i) { + var conf = scriptTypesConf[i]; + scriptTypes.push({matches: conf.matches, mode: conf.mode && CodeMirror.getMode(config, conf.mode)}); + } + scriptTypes.push({matches: /./, + mode: CodeMirror.getMode(config, "text/plain")}); + + function html(stream, state) { + var tagName = state.htmlState.tagName; + var style = htmlMode.token(stream, state.htmlState); + if (tagName == "script" && /\btag\b/.test(style) && stream.current() == ">") { + // Script block: mode to change to depends on type attribute + var scriptType = stream.string.slice(Math.max(0, stream.pos - 100), stream.pos).match(/\btype\s*=\s*("[^"]+"|'[^']+'|\S+)[^<]*$/i); + scriptType = scriptType ? scriptType[1] : ""; + if (scriptType && /[\"\']/.test(scriptType.charAt(0))) scriptType = scriptType.slice(1, scriptType.length - 1); + for (var i = 0; i < scriptTypes.length; ++i) { + var tp = scriptTypes[i]; + if (typeof tp.matches == "string" ? scriptType == tp.matches : tp.matches.test(scriptType)) { + if (tp.mode) { + state.token = script; + state.localMode = tp.mode; + state.localState = tp.mode.startState && tp.mode.startState(htmlMode.indent(state.htmlState, "")); + } + break; + } + } + } else if (tagName == "style" && /\btag\b/.test(style) && stream.current() == ">") { + state.token = css; + state.localMode = cssMode; + state.localState = cssMode.startState(htmlMode.indent(state.htmlState, "")); + } + return style; + } + function maybeBackup(stream, pat, style) { + var cur = stream.current(); + var close = cur.search(pat), m; + if (close > -1) stream.backUp(cur.length - close); + else if (m = cur.match(/<\/?$/)) { + stream.backUp(cur.length); + if (!stream.match(pat, false)) stream.match(cur[0]); + } + return style; + } + function script(stream, state) { + if (stream.match(/^<\/\s*script\s*>/i, false)) { + state.token = html; + state.localState = state.localMode = null; + return html(stream, state); + } + return maybeBackup(stream, /<\/\s*script\s*>/, + state.localMode.token(stream, state.localState)); + } + function css(stream, state) { + if (stream.match(/^<\/\s*style\s*>/i, false)) { + state.token = html; + state.localState = state.localMode = null; + return html(stream, state); + } + return maybeBackup(stream, /<\/\s*style\s*>/, + cssMode.token(stream, state.localState)); + } + + return { + startState: function() { + var state = htmlMode.startState(); + return {token: html, localMode: null, localState: null, htmlState: state}; + }, + + copyState: function(state) { + if (state.localState) + var local = CodeMirror.copyState(state.localMode, state.localState); + return {token: state.token, localMode: state.localMode, localState: local, + htmlState: CodeMirror.copyState(htmlMode, state.htmlState)}; + }, + + token: function(stream, state) { + return state.token(stream, state); + }, + + indent: function(state, textAfter) { + if (!state.localMode || /^\s*<\//.test(textAfter)) + return htmlMode.indent(state.htmlState, textAfter); + else if (state.localMode.indent) + return state.localMode.indent(state.localState, textAfter); + else + return CodeMirror.Pass; + }, + + electricChars: "/{}:", + + innerMode: function(state) { + return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode}; + } + }; +}, "xml", "javascript", "css"); + +CodeMirror.defineMIME("text/rythm", "rythmmixed"); \ No newline at end of file diff --git a/public/javascripts/codemirror-rythm.js b/public/javascripts/codemirror-rythm.js old mode 100755 new mode 100644 diff --git a/public/libs/angular/1.1.3/docs/docs-keywords.js b/public/libs/angular/1.1.3/docs/docs-keywords.js index 3e14d83..194a987 100644 --- a/public/libs/angular/1.1.3/docs/docs-keywords.js +++ b/public/libs/angular/1.1.3/docs/docs-keywords.js @@ -152,13 +152,13 @@ NG_PAGES=[ {"section":"api","id":"ngSanitize.$sanitize","shortName":"$sanitize","type":"service","keywords":"$sanitize $scope all any api are as back be binding browser by can color cols ctrl div element enter escape escaped escaped-html expect filter filtered function here however html html-filter html-unsafe-filter id if inline input into is it make means module more new ng-bind ng-bind-html ng-bind-html-unsafe ng-controller ng-model ngsanitize no obscure onmouseover our parser parsing possible properly pwn3d raw recognized returned rows safe sanitize sanitized sanitizer serialized service should since snippet some strict string style textcontent than that the then this through to tobe tokens typical unsafe update valid which whitelist without won would"}, {"section":"api","id":"ngSanitize.directive:ngBindHtml","shortName":"ngBindHtml","type":"directive","keywords":"$sanitize and any api binding creates current directive docs element evaluate evaluating examples expression for guide innerhtml into ngbindhtml ngsanitize of result sanitize see service that the to will with"}, {"section":"api","id":"ngSanitize.filter:linky","shortName":"linky","type":"filter","keywords":"$scope _blank address and another api binding cols ctrl email enter escaped-html expect filter finds frame ftp function href html html-linkified http id in input into it linkify links linky linky-filter linky-target linky_expression mailto module more named new ng-bind ng-bind-html ng-controller ng-model ngsanitize not one open or org plain pretty property rows should snippet snippetwithtarget some supports target text the them to tobe turns update urls window with without work"}, -{"section":"cookbook","id":"index","shortName":"Cookbook","type":"overview","keywords":"able abstractions across add advanced advancedform aids ajax allowing an anchor and angular api app application applications apps are as available away basic be behavior bidirectional binding bread but butter buzz by changes changing classic collection common communicate controller controllers cookbook creates data deep deeplinking demonstrates dependency design detection dirty disabling displaying dom easy editing eliminating emailing errors example exist external features first for form forms from full-page get global hello helloworld here if implement in initialization initialized injection instead is it its level likely linking links lived loads long maintainability makes model multi-page must mvc navigates never next objects of order overview own page particular pattern perils possible pre-bundled presentation prevent problem project providing reloading reloads resolves resources responsive reverting safeguards screen screens send separate separation services show simplest single solve specially specific state submit such tailored taking testability that the this through thus tic-tac-toe time-tested to tries typical update url urls useful user uses using validation view way we web welcome what which will with within without world you your"}, +{"section":"cookbook","id":"index","shortName":"Cookbook","type":"overview","keywords":"able abstractions across add advanced advancedform aids ajax allowing an anchor and angular api app application applications apps are as available away basic be behavior bidirectional binding bread but butter buzz by changes changing classic collection common communicate controller controllers cookbook creates data deep deeplinking demonstrates dependency design detection dirty disabling displaying dom easy editing eliminating emailing errors example exist external features first for form forms from full-page get global hello i18n here if implement in initialization initialized injection instead is it its level likely linking links lived loads long maintainability makes model multi-page must mvc navigates never next objects of order overview own page particular pattern perils possible pre-bundled presentation prevent problem project providing reloading reloads resolves resources responsive reverting safeguards screen screens send separate separation services show simplest single solve specially specific state submit such tailored taking testability that the this through thus tic-tac-toe time-tested to tries typical update url urls useful user uses using validation view way we web welcome what which will with within without world you your"}, {"section":"cookbook","id":"mvc","shortName":"MVC","type":"overview","keywords":"$index $location $rootscope $scope $watch above all allows and angular any api are as available back be because behavior between black board border browser button by call calls can cell cellstyle center changes changing class clean click code col connection controller cookbook copy cursor deep-linking defined diagonal droppiece easy element example execute expect for foreach from function functions game grade grafted has hash height html if in injected instantiate instantiated into invokes is isolation it javascript join just listener logic makes middle model mvc needed next nextmove ng-click ng-controller ng-repeat ng-show ng-style no notice object objects of one onto overview piece play player pointer primitives projection properties push readurl reference referenced rendering reset return row rows same scope search see separation set seturl share should simply since so solid split state steps still stored style td template test testable text text-align that the there things this tictactoecntl to toequal tr undo up url value var variable vertical-align very view when which width will winner without won"}, {"section":"cookbook","id":"advancedform","shortName":"Advanced Form","type":"overview","keywords":"$invalid $scope aa addcontact address advanced and angular anytown are as attr back basic being button buttons cancel change changes city click common contact contacts cookbook copy debug detection dirty disabled element enable enabled enter equals errors example expect extend features for form function here href if ii in include input internal invalid is iscanceldisabled issavedisabled it john length line1 main master model models myform name ng-click ng-controller ng-disabled ng-model ng-pattern ng-repeat no notice of on one only or original other overview phone presented preventing pristine push removecontact required return reverting reverts save should shows size smith something splice st state submission such text the there things to tobefalsy tobetruthy toequal two type updates user userform val validation value var view we zip"}, {"section":"cookbook","id":"buzz","shortName":"Resources - Buzz","type":"overview","keywords":"$inject $resource $scope activities activity activityid actor and angular api are attach background-operations be behavior buzz buzzcontroller callback can class click com comments content cookbook count data div element example expand expandreplies expect external factory fetch float font-size for function get give google googleapis googlebuzz has help href html http https id in item items json json_callback jsonp links margin-left max-height name names ng-click ng-controller ng-href ng-model ng-repeat ng-src object of overview params profileurl provide rendered replies reply resource resources retrieve right style templates that the them then this thumbnailurl to tobegreaterthan urls use used userid which with xit you"}, {"section":"cookbook","id":"deeplinking","shortName":"Deep Linking","type":"overview","keywords":"$add $inject $location $remove $route $routeprovider $scope alert allows also an and angular angular-sanitize anonymous any api app appcntl application appropriate are as assign associated assumptions background-color be behavior blue bookmarked bookmarks bootstraps border boundary but by can cancel case causes change changed changes changing chrome class click color com common config consist consists construct constructed contact contacts controller cookbook copy css current deal deep deeplinking define defined deps described details difference directive divided does each easy edit element email encode enter etc example expect footer for force form from function greet has have hello here home href html implement in index information initialization initialize input instantiated instantiates into is it js later like line linking loads make makes maps margin model module most multiple name navigate newly ng-bind-html ng-controller ng-view ng:click ng:model ng:repeat ngsanitize ngview no not notice of or overview padding page partial partial-info partials particular path person programatically proper refer required restored routes routing same save scenario scope screen screens script service services sets settings settingscntl several should show shows simple single snippet so solid something state style sufficient table template text that the then these things this to tomatch two type url useful user using very view views visible visit watches way we welcome welcomecntl when whether which while white widget will with would you your yourname"}, {"section":"cookbook","id":"form","shortName":"Form","type":"overview","keywords":"$rootscope $scope aa abc add addcontact adding address allow and angular anytown api application are array available be better blank both build by can city class classname click clicking contact contacts controller cookbook data data-bound debug debugging digits directive directives div element email enter entering example expect field for form formcontroller from function gather going have how href if ii in included initial initialized input inputs into is it items john json leaving length line1 link main make model name new ng-click ng-controller ng-model ng-pattern ng-repeat non not notice of off on operations or org overview phone present prop purpose purposes push read reason refer reflected remove removecontact required scope should show shows simple simply size smith splice st state strives text the them then these things this to tomatch trivial type understand updated user using validate value var view we web what which will with write xxx you your zip"}, -{"section":"cookbook","id":"helloworld","shortName":"Hello World","type":"overview","keywords":"$rootscope $scope and angular any api binding binds bootstraps bound brace change changes concept control cookbook curly data databinding directive double enter enters environment event events expect field firing for form function greeting guide hello hellocntl implicit in input is it listener look name need ng-controller ng-model no note notice of on overview presence reflects registration root scope script should source tag take templates text that the there things through to toequal type user value variable when which world your"}, +{"section":"cookbook","id":"i18n","shortName":"Hello World","type":"overview","keywords":"$rootscope $scope and angular any api binding binds bootstraps bound brace change changes concept control cookbook curly data databinding directive double enter enters environment event events expect field firing for form function greeting guide hello hellocntl implicit in input is it listener look name need ng-controller ng-model no note notice of on overview presence reflects registration root scope script should source tag take templates text that the there things through to toequal type user value variable when which world your"}, {"section":"guide","id":"index","shortName":"Developer Guide","type":"overview","keywords":"angular apps are before both check come completely details develop developer documents following getting guide here how if learn may misc of one or out overview place relatively returning right started the to tutorial unfamiliar use ve want web welcome with you"}, {"section":"guide","id":"overview","shortName":"Overview","type":"overview","keywords":"$10 $19 $scope _expression_ _really_ _you_ about above abstraction achieved affected ajax all allowfullscreen allowing allows almost also although always amount an and angular angularjs another any api app application applications approach apps are around as at attaching attempts attribute auto auto-injected automated automatically back bare based basic be because been behaved behavior behaviors belief below better between bind binding blank boilerplate bonus bootstrap both bound box braces browser build building built business but by call callbacks calling calls can cases cause centric change changes charge clearly client closer clutters code code-behind coding cohesive collection com combination comes common component components compute computing concepts consider construct constructs contain contains control cornerstone cost creates creating crud cumbersome curly currency currently data data-binding data-model declarative declaratively decouple deep-linking demonstrate dependency dependency-injection describe describes describing design designed designing details dev_guide developer developers developing development different difficult difficulty directive directives directory directs display displaying do document documents does doing dom double double-curly dramatically dynamic easier easily easy editors elements eliminates end-to-end enough enter entire equal error-prone errors etc every everything example examples excellent exercise expect express expressing expression extend face features field fields fills filter filters finally fit flexibility flow following for forest form format formatted formatting forms fragments frameborder framework freed frees from full function functions games get going good google googleapis got great grouping gui guice guide guides had happens hard harnesses has have height hello helpful here higher how html http https idea ideal if impedance imperative implement implementation implementing importance improves in include indeed index initialization initialize injection input integer intensive internal into introductory invalid invalidates invoicecntl is it its itself javascript journey jquery js just kinds knockout language layout least leave leaving let lets level library like line live load loaded locale logic look looks lot low lowered luckily majority make makes making manipulate manipulating manipulation markup marshaling may means metal methods min mind minimize mismatch mocks model model-view-controller modify money more most much multiply mysterious name names need needed needs never new ng-app ng-controller ng-model no nor normal not notation note notice number object of often on one operations opinion opinionated or other out out-of-the-box output over overall overview page pain parallel particular partner pattern piece plumbing point points possible powers presentation presenting preview process programmatically progress provides puzzle qty quantity quickly rather reading really red reduces regard registering removing repeating represent required result resulting returning reusable reuse routing same scenario script scripts see seed sees server services set sets should show side sides simplifies single so software solution solved some something special specific specify spot sproutcore src started starting state static story structural structured structures style succinctly such support sure sweet syntax tag tags takes tasks teaches technology template templates templating test testability testing tests than that the them then these thing think this those through to toequal together tons total trees trick tricky tries trivial try turning two-way type typical typically ui uis understand unit-testing up use used useful user users using validated validating validation values variables vastly very walk want was watch way we web what when where which while widget widgets width will wiring with within words work working world would write writing written you your youtube zen"}, {"section":"guide","id":"bootstrap","shortName":"Bootstrap","type":"overview","keywords":"$injector add after all allows an and angular angular- angularjs api app application as associated at auto-bootstrap automatic automatically because before bi-directionally bits blocked bootstrap bootstrapping bottom bound by call can choose code compilation compile compiler compiles compressed control create debugging designates developer development directive do document dom domcontentloaded don element end equivalent event example examples executable experimental explains expose file find fine follow for found from get guide happy have hello here historical hole how html http human-readable ie if improves in include initialization initialize initializes initializing injector instead integrating into is it js latest link linking load loaded loaders loading longer looks make manual manually method min module more necessary need ng ng-app no not obfuscated of old on only operation optionalmodulename or org our over overview page path perform place placing please point portion process production ready reasons recommend recommended root script security sequence should shows site src style suitable syntax tag tags tell template that the then this time to treat treating typically upon url use using want we what when which will with world xml-namespace xmlns you your"}, diff --git a/public/libs/angular/1.1.3/docs/docs-scenario.js b/public/libs/angular/1.1.3/docs/docs-scenario.js index f9cf551..392e11b 100644 --- a/public/libs/angular/1.1.3/docs/docs-scenario.js +++ b/public/libs/angular/1.1.3/docs/docs-scenario.js @@ -69,9 +69,9 @@ describe("angular+jqlite", function() { }); - describe("cookbook/helloworld", function() { + describe("cookbook/i18n", function() { beforeEach(function() { - browser().navigateTo("index-nocache.html#!/cookbook/helloworld"); + browser().navigateTo("index-nocache.html#!/cookbook/i18n"); }); it('should change the binding when user enters text', function() { @@ -2386,9 +2386,9 @@ describe("angular+jquery", function() { }); - describe("cookbook/helloworld", function() { + describe("cookbook/i18n", function() { beforeEach(function() { - browser().navigateTo("index-jq-nocache.html#!/cookbook/helloworld"); + browser().navigateTo("index-jq-nocache.html#!/cookbook/i18n"); }); it('should change the binding when user enters text', function() { diff --git a/public/libs/bootstrap-ui/0.2.0/template/tabs/tabs.html b/public/libs/bootstrap-ui/0.2.0/template/tabs/tabs.html old mode 100755 new mode 100644 diff --git a/public/libs/bootstrap-ui/0.2.0/ui-bootstrap-tpls-0.2.0.js b/public/libs/bootstrap-ui/0.2.0/ui-bootstrap-tpls-0.2.0.js old mode 100755 new mode 100644 diff --git a/public/libs/bootstrap/2.3.1/css/cosmo.min.css b/public/libs/bootstrap/2.3.1/css/cosmo.min.css old mode 100755 new mode 100644 diff --git a/public/stylesheets/result-pretty.css b/public/stylesheets/result-pretty.css index 80d8655..6fdd51d 100644 --- a/public/stylesheets/result-pretty.css +++ b/public/stylesheets/result-pretty.css @@ -18,7 +18,7 @@ } .typ { - color: rgb(159, 205, 223);; + color: rgb(159, 205, 223); } .lit { @@ -26,11 +26,11 @@ } .pun { - color: #F1F2F3; + color: #ccc; } .pln { - color: #F1F2F3; + color: #ccc; } .tag { diff --git a/public/stylesheets/rythm-web.css b/public/stylesheets/rythm-web.css index ed88a80..7f36e2c 100644 --- a/public/stylesheets/rythm-web.css +++ b/public/stylesheets/rythm-web.css @@ -3,16 +3,16 @@ html * { rendering-intent: auto; } .cm-s-rythm-web-light,.cm-s-rythm-web { - font-family: Monaco, Menlo, Consolas, 'Courier New', monospace; + font-family: "Source Code Pro Semibold","Envy Code R",Consolas, Monaco, Menlo, 'Courier New', monospace; font-size: 10pt; - line-height: 28px; + line-height: 20px; } .cm-s-rythm-web-light .CodeMirror-gutters,.cm-s-rythm-web .CodeMirror-gutters { background-color: #000; } .cm-s-rythm-web-light.CodeMirror pre,.CodeMirror.cm-s-rythm-web pre { - color: #E0E2E4; - } + color: #bbb; +} .cm-s-rythm-web-light { background-color: #fdf6e3; color: #657b83;