From 4e9d870945d67503a3397b000a55e045b8dd0506 Mon Sep 17 00:00:00 2001 From: Green Luo Date: Sun, 7 Apr 2013 09:13:01 +1000 Subject: [PATCH 01/39] add shortcuts to editor UI --- angular-seed/app/js/app.js | 0 angular-seed/app/js/controllers.js | 11 +++++++++-- angular-seed/app/partials/editor.html | 6 +++++- angular-seed/app/partials/save_dialog.html | 2 +- public/libs/codemirror/3.1/lib/codemirror.js | 0 5 files changed, 15 insertions(+), 4 deletions(-) mode change 100644 => 100755 angular-seed/app/js/app.js mode change 100644 => 100755 public/libs/codemirror/3.1/lib/codemirror.js diff --git a/angular-seed/app/js/app.js b/angular-seed/app/js/app.js old mode 100644 new mode 100755 diff --git a/angular-seed/app/js/controllers.js b/angular-seed/app/js/controllers.js index 2f7f977..6617a02 100755 --- a/angular-seed/app/js/controllers.js +++ b/angular-seed/app/js/controllers.js @@ -69,6 +69,12 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { var keyCode = $event.keyCode; if (keyCode === 10 || keyCode == 13 && $event.ctrlKey) { run(); + } else if (keyCode == 84 && $event.ctrlKey && $event.altKey) { + $('.source textarea').focus(); + } else if (keyCode == 80 && $event.ctrlKey && $event.altKey) { + $('.params textarea').focus(); + } else { + //console.log(keyCode); } } @@ -262,9 +268,10 @@ 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); + }); } } diff --git a/angular-seed/app/partials/editor.html b/angular-seed/app/partials/editor.html index 3a7ef03..88c0302 100755 --- a/angular-seed/app/partials/editor.html +++ b/angular-seed/app/partials/editor.html @@ -96,9 +96,10 @@
-
@@ -134,6 +135,9 @@ h2 = $('.params .CodeMirror').height(); $('#RESULT_PANEL pre.result').css({'height': (h1 - h2 - 27) + 'px', 'overflow-y':'auto'}); }, 300); + CodeMirror.commands.save = function(cm){ + $('button[ng-click="save()"]').click(); + } diff --git a/angular-seed/app/partials/save_dialog.html b/angular-seed/app/partials/save_dialog.html index 1ce5b18..8547b97 100755 --- a/angular-seed/app/partials/save_dialog.html +++ b/angular-seed/app/partials/save_dialog.html @@ -4,7 +4,7 @@
- +
diff --git a/public/libs/codemirror/3.1/lib/codemirror.js b/public/libs/codemirror/3.1/lib/codemirror.js old mode 100644 new mode 100755 From e3eb9a837bc05aba7e9f62df0f4853d823f6603e Mon Sep 17 00:00:00 2001 From: Green Luo Date: Sun, 7 Apr 2013 10:28:00 +1000 Subject: [PATCH 02/39] F2 to rename current source;escape to cancel rename or add new source --- angular-seed/app/js/controllers.js | 48 ++++++++++++++++++++------- angular-seed/app/partials/editor.html | 15 ++++++--- 2 files changed, 46 insertions(+), 17 deletions(-) diff --git a/angular-seed/app/js/controllers.js b/angular-seed/app/js/controllers.js index 6617a02..99492fe 100755 --- a/angular-seed/app/js/controllers.js +++ b/angular-seed/app/js/controllers.js @@ -59,22 +59,40 @@ 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() { + if ($scope.$focus) { + $scope.$focus().focus(); + } + else alert("no focus"); + } function keyEventHandlerForCodeMirror($event) { var keyCode = $event.keyCode; if (keyCode === 10 || keyCode == 13 && $event.ctrlKey) { run(); - } else if (keyCode == 84 && $event.ctrlKey && $event.altKey) { - $('.source textarea').focus(); - } else if (keyCode == 80 && $event.ctrlKey && $event.altKey) { - $('.params textarea').focus(); - } else { - //console.log(keyCode); + } 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(); } } @@ -114,6 +132,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; }); @@ -128,6 +147,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); @@ -164,18 +184,22 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { } } - 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; + setTimeout(function(){$scope.restoreFocus();}, 1); } function removeCurrentCode() { @@ -215,7 +239,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; @@ -252,7 +276,6 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { newOne.isMain = true; } } - } EditorCtrl.$inject = ['$scope', '$http', '$routeParams', '$dialog', '$location', '$timeout']; @@ -273,6 +296,7 @@ function SaveDialogCtrl($scope, dialog, code, $http, saveAsNew) { alert(data); }); } + } SaveDialogCtrl.$inject = ['$scope', 'dialog', 'code', '$http', 'saveAsNew']; diff --git a/angular-seed/app/partials/editor.html b/angular-seed/app/partials/editor.html index 88c0302..fa290eb 100755 --- a/angular-seed/app/partials/editor.html +++ b/angular-seed/app/partials/editor.html @@ -61,13 +61,13 @@ - + - + - @@ -80,11 +80,11 @@
- + - + @@ -138,6 +138,11 @@ CodeMirror.commands.save = function(cm){ $('button[ng-click="save()"]').click(); } + $(window).on('keydown', function(event) { + if (event.which == 113) { // F2 + $('.btn[ng-click="renameFile()"]').click(); + } + }); From fd96c0cb5585c9d89f29c45fdeafc32552caba02 Mon Sep 17 00:00:00 2001 From: Green Luo Date: Sun, 7 Apr 2013 10:45:17 +1000 Subject: [PATCH 03/39] Add shortcut information to about dialog --- angular-seed/app/js/controllers.js | 6 +++--- angular-seed/app/partials/about.html | 13 +++++++++++-- angular-seed/app/partials/editor.html | 12 ++++++++++++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/angular-seed/app/js/controllers.js b/angular-seed/app/js/controllers.js index 99492fe..46f1ca5 100755 --- a/angular-seed/app/js/controllers.js +++ b/angular-seed/app/js/controllers.js @@ -88,9 +88,9 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { 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(); +// var $t = $scope.ta.$source(), $p = $scope.ta.$params(); +// if ($t.is(':focus')) $p.focus(); +// else $t.focus(); } else if (keyCode == 113 /*F2*/) { renameFile(); } diff --git a/angular-seed/app/partials/about.html b/angular-seed/app/partials/about.html index cd21fce..0d051db 100755 --- a/angular-seed/app/partials/about.html +++ b/angular-seed/app/partials/about.html @@ -3,12 +3,21 @@

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

+ +

Shortcut keys

+
    +
  • Ctrl-Enter: Run the fiddle (Only in editors)
    • +
  • F2: Rename current source file (Global)
    • +
  • Escape: Cancel source file rename (Only in rename input text element)
    • +
  • Ctrl-Alt-T: Toggle focus between source editor and param editor (Only in editors)
    • +
  • Ctrl-Alt-T: Focus source editor (focus is not in editors
    • +
Close diff --git a/angular-seed/app/partials/editor.html b/angular-seed/app/partials/editor.html index fa290eb..79dd23a 100755 --- a/angular-seed/app/partials/editor.html +++ b/angular-seed/app/partials/editor.html @@ -141,6 +141,18 @@ $(window).on('keydown', function(event) { if (event.which == 113) { // F2 $('.btn[ng-click="renameFile()"]').click(); + } else { + //console.log(event); + } + }); + $(window).on('keyup', function(event){ + if (event.which == 84 && event.ctrlKey && event.altKey) { // ctrl-alt-t + var $s = $('.source textarea'), $p = $('.params textarea'); + if ($s.is(':focus')) { + $p.focus(); + } else { + $s.focus(); + } } }); From 5947988cb5fd395b20a70f33c1e9d6d56b737430 Mon Sep 17 00:00:00 2001 From: Green Luo Date: Sun, 7 Apr 2013 16:13:11 +1000 Subject: [PATCH 04/39] alt-1~9 to select the nth source file, allow open editor from the embed view, autofocus to the editor --- angular-seed/app/embed.html | 10 +++++++++- angular-seed/app/js/controllers.js | 16 +++++++++++----- angular-seed/app/partials/about.html | 1 + angular-seed/app/partials/editor.html | 22 ++++++++++++++-------- angular-seed/app/partials/embed.html | 3 +++ 5 files changed, 38 insertions(+), 14 deletions(-) diff --git a/angular-seed/app/embed.html b/angular-seed/app/embed.html index 4da1760..83d05a5 100755 --- a/angular-seed/app/embed.html +++ b/angular-seed/app/embed.html @@ -136,7 +136,15 @@ 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'); + $('body').on('click', '#view_in_fiddle', function(e){ + if (top === window) { + } else { + e.stopImmediatePropagation(); + window._trigger_parent("_open_in_fiddle", {fiddle_id: $(this).data('id')}); + return false; + } + }); }); setInterval(function(){ if ($('.source .CodeMirror .tag.lbl').size() > 0) return; diff --git a/angular-seed/app/js/controllers.js b/angular-seed/app/js/controllers.js index 46f1ca5..41c91ab 100755 --- a/angular-seed/app/js/controllers.js +++ b/angular-seed/app/js/controllers.js @@ -77,10 +77,13 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { } }; $scope.restoreFocus = function() { - if ($scope.$focus) { - $scope.$focus().focus(); - } - else alert("no focus"); + setTimeout(function(){ + if ($scope.$focus) { + $scope.$focus().focus(); + } else { + $('.source textarea').focus(); + } + },1); } function keyEventHandlerForCodeMirror($event) { @@ -166,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'); @@ -182,6 +187,7 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { file.filename = editName; file.editing = false; } + $scope.restoreFocus(); } function renameFile(file) { @@ -199,7 +205,7 @@ function EditorCtrl($scope, $http, $routeParams, $dialog, $location, $timeout) { } file.editName = null; file.editing = false; - setTimeout(function(){$scope.restoreFocus();}, 1); + $scope.restoreFocus(); } function removeCurrentCode() { diff --git a/angular-seed/app/partials/about.html b/angular-seed/app/partials/about.html index 0d051db..ecf6f25 100755 --- a/angular-seed/app/partials/about.html +++ b/angular-seed/app/partials/about.html @@ -17,6 +17,7 @@

Rythm Fiddle

  • Escape: Cancel source file rename (Only in rename input text element)
  • Ctrl-Alt-T: Toggle focus between source editor and param editor (Only in editors)
  • Ctrl-Alt-T: Focus source editor (focus is not in editors
    • +
  • Alt-1 ~ 9: Select the nth template source file
    • diff --git a/angular-seed/app/partials/editor.html b/angular-seed/app/partials/editor.html index 79dd23a..5c577f3 100755 --- a/angular-seed/app/partials/editor.html +++ b/angular-seed/app/partials/editor.html @@ -22,12 +22,12 @@
    -
    - - Compact View - -
    + + + + + +
    @@ -81,7 +81,7 @@
    - @@ -100,6 +100,7 @@ name="codeSource" ui-refresh="getActiveFile().active" ng-model="getActiveFile().source" autofocus="autofocus" + ui-event="{focus: storeCurFocus()}" >@args String who\nHello @who!
    @@ -113,7 +114,7 @@
    @@ -153,6 +154,11 @@ } else { $s.focus(); } + } else if (event.altKey && (47 < event.which) && (58 > event.which)) { + //alt 1 -> alt 10 + var id = event.which - 48; + if (id == 0) id = 10; + $('ul.nav-tabs li:nth-child(' + id + ') a').trigger('click'); } }); diff --git a/angular-seed/app/partials/embed.html b/angular-seed/app/partials/embed.html index 5f8b3e5..9834455 100755 --- a/angular-seed/app/partials/embed.html +++ b/angular-seed/app/partials/embed.html @@ -2,6 +2,9 @@
    + + View in Fiddle + From ffc6b48656b15938ad3cbf7b9eb17850efbb522e Mon Sep 17 00:00:00 2001 From: green Date: Sun, 7 Apr 2013 16:46:24 +1000 Subject: [PATCH 05/39] update open in fiddle logic --- angular-seed/app/embed.html | 8 -------- angular-seed/app/partials/embed.html | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/angular-seed/app/embed.html b/angular-seed/app/embed.html index 83d05a5..3a739b2 100755 --- a/angular-seed/app/embed.html +++ b/angular-seed/app/embed.html @@ -137,14 +137,6 @@ $_.html($_.data('label')).animate({opacity: 0.7}, 400); } }, '.source .CodeMirror, .params .CodeMirror, #RESULT_PANEL div.result'); - $('body').on('click', '#view_in_fiddle', function(e){ - if (top === window) { - } else { - e.stopImmediatePropagation(); - window._trigger_parent("_open_in_fiddle", {fiddle_id: $(this).data('id')}); - return false; - } - }); }); setInterval(function(){ if ($('.source .CodeMirror .tag.lbl').size() > 0) return; diff --git a/angular-seed/app/partials/embed.html b/angular-seed/app/partials/embed.html index 9834455..7534b78 100755 --- a/angular-seed/app/partials/embed.html +++ b/angular-seed/app/partials/embed.html @@ -2,7 +2,7 @@
    - + View in Fiddle From a487fab7ea23ab6d003c891c2eb698fdb0525463 Mon Sep 17 00:00:00 2001 From: Green Luo Date: Sun, 7 Apr 2013 22:21:02 +1000 Subject: [PATCH 06/39] support messages.xx as resource files for i18n --- angular-seed/app/partials/about.html | 2 + app/models/Code.java | 5 +- app/models/InMemoryMessageResolver.java | 108 ++++++++++++++++++++++++ app/models/InMemoryResourceLoader.java | 2 +- 4 files changed, 115 insertions(+), 2 deletions(-) create mode 100755 app/models/InMemoryMessageResolver.java diff --git a/angular-seed/app/partials/about.html b/angular-seed/app/partials/about.html index ecf6f25..026cdd6 100755 --- a/angular-seed/app/partials/about.html +++ b/angular-seed/app/partials/about.html @@ -10,6 +10,8 @@

    Rythm Fiddle

    License: Apache License, Version 2

    +

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

    +

    Shortcut keys

    • Ctrl-Enter: Run the fiddle (Only in editors)
      • diff --git a/app/models/Code.java b/app/models/Code.java index b2e22ed..6c3cc63 100755 --- a/app/models/Code.java +++ b/app/models/Code.java @@ -15,6 +15,7 @@ import play.mvc.Scope; import java.io.IOException; +import java.io.Serializable; import java.util.*; import static common.Helper.eq; @@ -24,7 +25,7 @@ * Date: 13-3-18 * Time: 下午6:07 */ -public class Code { +public class Code implements Serializable { public String id; public String desc; @@ -81,6 +82,7 @@ public String sourceCode() { 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); e = new RythmEngine(conf); @@ -137,6 +139,7 @@ public void save(String sessionId) { for (CodeFile file : files) { file.save(sessionId); } + InMemoryMessageResolver.save(this, sessionId); } } diff --git a/app/models/InMemoryMessageResolver.java b/app/models/InMemoryMessageResolver.java new file mode 100755 index 0000000..835e603 --- /dev/null +++ b/app/models/InMemoryMessageResolver.java @@ -0,0 +1,108 @@ +package models; + +import com.greenlaw110.rythm.extension.II18nMessageResolver; +import com.greenlaw110.rythm.template.ITemplate; +import com.greenlaw110.rythm.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) { + if (cf.filename.startsWith("messages.")) { + String s = locale.toString(); + while(true) { + String retVal = null, fn = "messages." + 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 index 26f9069..9920a2d 100755 --- a/app/models/InMemoryResourceLoader.java +++ b/app/models/InMemoryResourceLoader.java @@ -36,7 +36,7 @@ public static CodeFile load(String path, String sessionId) { return (CodeFile)Cache.get(key(path, sessionId)); } - private static String key(String path, String sessionId) { + protected static String key(String path, String sessionId) { return sessionId + "://" + path; } From 8ba0b4a5050b146c812a4ff10f1546b244fcfcd0 Mon Sep 17 00:00:00 2001 From: Green Luo Date: Sun, 7 Apr 2013 22:40:06 +1000 Subject: [PATCH 07/39] update embed top-bar button group css --- angular-seed/app/embed.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angular-seed/app/embed.html b/angular-seed/app/embed.html index 3a739b2..bbc889d 100755 --- 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;} From d8e81278333c745490ba05860a325edb614bf141 Mon Sep 17 00:00:00 2001 From: Green Luo Date: Sun, 7 Apr 2013 22:47:46 +1000 Subject: [PATCH 08/39] allow shortname msg. or m. for resource file --- angular-seed/app/partials/about.html | 2 +- app/models/InMemoryMessageResolver.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/angular-seed/app/partials/about.html b/angular-seed/app/partials/about.html index 026cdd6..4efb33c 100755 --- a/angular-seed/app/partials/about.html +++ b/angular-seed/app/partials/about.html @@ -10,7 +10,7 @@

      Rythm Fiddle

      License: Apache License, Version 2

      -

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

      +

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

      Shortcut keys

        diff --git a/app/models/InMemoryMessageResolver.java b/app/models/InMemoryMessageResolver.java index 835e603..c21e268 100755 --- a/app/models/InMemoryMessageResolver.java +++ b/app/models/InMemoryMessageResolver.java @@ -75,10 +75,14 @@ public String getMessage(ITemplate template, String key, Object... args) { Code code = Cache.get(key(CACHE_KEY, sessionId), Code.class); for (CodeFile cf: code.files) { - if (cf.filename.startsWith("messages.")) { + String fn0 = cf.filename; + if (fn0.startsWith("messages.") || fn0.startsWith("msg.") || fn0.startsWith("m.")) { String s = locale.toString(); while(true) { - String retVal = null, fn = "messages." + s; + 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; From 6b69ae3b2539c67fbcbdd25fab7cb3fd6eb83bef Mon Sep 17 00:00:00 2001 From: Green Luo Date: Thu, 11 Apr 2013 19:40:37 +1000 Subject: [PATCH 09/39] fix issue: cannot scoll para box --- angular-seed/app/css/app.css | 3 +++ angular-seed/app/partials/editor.html | 2 +- app/models/Code.java | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/angular-seed/app/css/app.css b/angular-seed/app/css/app.css index 7a015a0..04534d3 100755 --- a/angular-seed/app/css/app.css +++ b/angular-seed/app/css/app.css @@ -61,6 +61,9 @@ .params .CodeMirror { height: auto; +} + +.params { max-height: 300px; overflow-y: auto; } diff --git a/angular-seed/app/partials/editor.html b/angular-seed/app/partials/editor.html index 5c577f3..d86e1b4 100755 --- a/angular-seed/app/partials/editor.html +++ b/angular-seed/app/partials/editor.html @@ -133,7 +133,7 @@