Skip to content

Commit c343b32

Browse files
authored
Merge pull request #1106 from crazyserver/MOBILE-2178
Mobile 2178
2 parents 0340386 + 754ba55 commit c343b32

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
22
<input ng-if="mode != 'show'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
3-
<mm-format-text ng-if="mode == 'show'" watch="true"><a ng-href="text">{{text}}</a></mm-format-text>
3+
<a ng-if="mode == 'show'" ng-href="{{text}}">{{field.name}}</a>

www/addons/mod/data/scss/styles.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
width: 100%;
104104
margin: -1px;
105105
border: 1px solid $gray;
106+
overflow: hidden;
106107
}
107108

108109
.item-checkbox {

www/addons/mod/data/services/helper.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ angular.module('mm.addons.mod_data')
5555
angular.forEach(fields, function(field) {
5656
replace = "[[" + field.name + "]]";
5757
replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
58-
replace = new RegExp(replace, 'g');
58+
replace = new RegExp(replace, 'gi');
5959

6060
// Replace field by a generic directive.
6161
render = '<mma-mod-data-field mode="'+mode+'" field="fields['+ field.id + ']" value="entries['+ entryId +'].contents['+ field.id + ']" database="data" view-action="gotoEntry('+ entryId +')"></mma-mod-data-field>';
6262
template = template.replace(replace, render);
6363
});
6464

6565
angular.forEach(actions, function(enabled, action) {
66-
replace = new RegExp("##" + action + "##", 'g');
66+
replace = new RegExp("##" + action + "##", 'gi');
6767
if (enabled) {
6868
if (action == "moreurl") {
6969
// Render more url directly because it can be part of an HTML attribute.
@@ -196,7 +196,7 @@ angular.module('mm.addons.mod_data')
196196
angular.forEach(fields, function(field) {
197197
replace = "[[" + field.name + "]]";
198198
replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
199-
replace = new RegExp(replace, 'g');
199+
replace = new RegExp(replace, 'gi');
200200

201201
// Replace field by a generic directive.
202202
var render = '<mma-mod-data-field mode="search" field="fields['+ field.id + ']"></mma-mod-data-field>';
@@ -205,7 +205,7 @@ angular.module('mm.addons.mod_data')
205205

206206
// Not pluginable other search elements.
207207
angular.forEach(self.searchOther, function(field, name) {
208-
replace = new RegExp("##" + field + "##", 'g');
208+
replace = new RegExp("##" + field + "##", 'gi');
209209

210210
// Replace field by the text input.
211211
var render = '<input type="text" name="' + name + '" placeholder="{{ \'mma.mod_data.author' + field + '\' | translate }}">';
@@ -315,7 +315,7 @@ angular.module('mm.addons.mod_data')
315315
angular.forEach(fields, function(field) {
316316
replace = "[[" + field.name + "]]";
317317
replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
318-
replace = new RegExp(replace, 'g');
318+
replace = new RegExp(replace, 'gi');
319319

320320
// Replace field by a generic directive.
321321
var render = '<mma-mod-data-field mode="edit" field="fields['+ field.id + ']" value="entry.contents['+ field.id + ']" database="data" error="errors['+ field.id + ']"></mma-mod-data-field>';
@@ -324,7 +324,7 @@ angular.module('mm.addons.mod_data')
324324
// Replace the field id tag.
325325
replace = "[[" + field.name + "#id]]";
326326
replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
327-
replace = new RegExp(replace, 'g');
327+
replace = new RegExp(replace, 'gi');
328328

329329
template = template.replace(replace, 'field_'+ field.id);
330330
});

0 commit comments

Comments
 (0)