diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-11-27 14:51:38 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2018-11-28 12:48:51 +0100 |
| commit | f63ab0355c2cb6f8fdb189fa9766bcedb91218a8 (patch) | |
| tree | 64df9e9178e79ee9a8a17cf0174793662d370064 | |
| parent | 252c53e780a3557f073981cea78c8982f39745e5 (diff) | |
Move RichObjectStringParser into the views folder
Although the RichObjectStringParser is not a view as such its
functionality is closedly tied to views, so the views folder is a better
place to live in.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| -rw-r--r-- | js/views/chatview.js | 2 | ||||
| -rw-r--r-- | js/views/richobjectstringparser.js (renamed from js/richobjectstringparser.js) | 2 | ||||
| -rw-r--r-- | lib/PublicShareAuth/TemplateLoader.php | 2 | ||||
| -rw-r--r-- | templates/index-public.php | 2 | ||||
| -rw-r--r-- | templates/index.php | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/js/views/chatview.js b/js/views/chatview.js index 2a7106337..e1957c1a2 100644 --- a/js/views/chatview.js +++ b/js/views/chatview.js @@ -336,7 +336,7 @@ var formattedMessage = escapeHTML(commentModel.get('message')).replace(/\n/g, '<br/>'); formattedMessage = OCP.Comments.plainToRich(formattedMessage); - formattedMessage = OCA.SpreedMe.RichObjectStringParser.parseMessage( + formattedMessage = OCA.SpreedMe.Views.RichObjectStringParser.parseMessage( formattedMessage, commentModel.get('messageParameters')); var data = _.extend({}, commentModel.attributes, { diff --git a/js/richobjectstringparser.js b/js/views/richobjectstringparser.js index 83a0360f8..f5a125a89 100644 --- a/js/richobjectstringparser.js +++ b/js/views/richobjectstringparser.js @@ -11,7 +11,7 @@ (function(OC, OCA, Handlebars) { - OCA.SpreedMe.RichObjectStringParser = { + OCA.SpreedMe.Views.RichObjectStringParser = { _userLocalTemplate: '' + '<span class="atwho-inserted" contenteditable="false">' + diff --git a/lib/PublicShareAuth/TemplateLoader.php b/lib/PublicShareAuth/TemplateLoader.php index 2052f3195..5e6a6c460 100644 --- a/lib/PublicShareAuth/TemplateLoader.php +++ b/lib/PublicShareAuth/TemplateLoader.php @@ -94,12 +94,12 @@ class TemplateLoader { Util::addScript('spreed', 'views/editabletextlabel'); Util::addScript('spreed', 'views/participantlistview'); Util::addScript('spreed', 'views/participantview'); + Util::addScript('spreed', 'views/richobjectstringparser'); Util::addScript('spreed', 'views/roomlistview'); Util::addScript('spreed', 'views/sidebarview'); Util::addScript('spreed', 'views/tabview'); Util::addScript('spreed', 'views/templates'); Util::addScript('spreed', 'views/virtuallist'); - Util::addScript('spreed', 'richobjectstringparser'); Util::addScript('spreed', 'simplewebrtc'); Util::addScript('spreed', 'webrtc'); Util::addScript('spreed', 'signaling'); diff --git a/templates/index-public.php b/templates/index-public.php index 799b54bd8..5e0e22530 100644 --- a/templates/index-public.php +++ b/templates/index-public.php @@ -29,12 +29,12 @@ script( 'views/editabletextlabel', 'views/participantlistview', 'views/participantview', + 'views/richobjectstringparser', 'views/roomlistview', 'views/sidebarview', 'views/tabview', 'views/templates', 'views/virtuallist', - 'richobjectstringparser', 'simplewebrtc', 'webrtc', 'signaling', diff --git a/templates/index.php b/templates/index.php index a3dbb5290..3f954b11a 100644 --- a/templates/index.php +++ b/templates/index.php @@ -28,12 +28,12 @@ script( 'views/editabletextlabel', 'views/participantlistview', 'views/participantview', + 'views/richobjectstringparser', 'views/roomlistview', 'views/sidebarview', 'views/tabview', 'views/templates', 'views/virtuallist', - 'richobjectstringparser', 'simplewebrtc', 'webrtc', 'signaling', |