Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
guy 6 years ago
parent
commit
8e63a212ea
  1. 2
      dist/base.js
  2. 9
      dist/bundle.js
  3. 34
      dist/bundle.min.js
  4. 7
      dist/core.js
  5. 9
      dist/fineui.js
  6. 34
      dist/fineui.min.js
  7. 9
      dist/fineui_without_jquery_polyfill.js
  8. 7
      dist/utils.js
  9. 4
      dist/utils.min.js
  10. 2
      src/base/single/editor/editor.textarea.js
  11. 7
      src/core/alias.js

2
dist/base.js vendored

@ -8793,7 +8793,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
},
left: 0,
right: 3,
top: 0,
top: 6,
bottom: 5
}]
});

9
dist/bundle.js vendored

@ -15944,7 +15944,12 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
default:
return BI.specialCharsMap[str] || str;
}
});
return _global.encodeURIComponent(url);
};
@ -44046,7 +44051,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
},
left: 0,
right: 3,
top: 0,
top: 6,
bottom: 5
}]
});

34
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/core.js vendored

@ -15944,7 +15944,12 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
default:
return BI.specialCharsMap[str] || str;
}
});
return _global.encodeURIComponent(url);
};

9
dist/fineui.js vendored

@ -16185,7 +16185,12 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
default:
return BI.specialCharsMap[str] || str;
}
});
return _global.encodeURIComponent(url);
};
@ -44287,7 +44292,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
},
left: 0,
right: 3,
top: 0,
top: 6,
bottom: 5
}]
});

34
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/fineui_without_jquery_polyfill.js vendored

@ -15690,7 +15690,12 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
default:
return BI.specialCharsMap[str] || str;
}
});
return _global.encodeURIComponent(url);
};
@ -31978,7 +31983,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
},
left: 0,
right: 3,
top: 0,
top: 6,
bottom: 5
}]
});

7
dist/utils.js vendored

@ -13038,7 +13038,12 @@ _.extend(BI.OB.prototype, {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
default:
return BI.specialCharsMap[str] || str;
}
});
return _global.encodeURIComponent(url);
};

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
src/base/single/editor/editor.textarea.js

@ -32,7 +32,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
},
left: 0,
right: 3,
top: 0,
top: 6,
bottom: 5
}]
});

7
src/core/alias.js

@ -589,7 +589,12 @@
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
switch (str) {
case "\\":
return BI.specialCharsMap["\\\\"] || str;
default:
return BI.specialCharsMap[str] || str;
}
});
return _global.encodeURIComponent(url);
};

Loading…
Cancel
Save