mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-18 23:43:12 +00:00
Add missing slash on zxcvbn path
This commit is contained in:
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@@ -63,7 +63,7 @@ Vagrant.configure("2") do |config|
|
|||||||
v.customize [
|
v.customize [
|
||||||
"modifyvm", :id,
|
"modifyvm", :id,
|
||||||
"--name", $hostname,
|
"--name", $hostname,
|
||||||
"--memory", 4096,
|
"--memory", 2048,
|
||||||
"--cpus", 2,
|
"--cpus", 2,
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
@@ -106,29 +106,4 @@
|
|||||||
{% block scripts %}
|
{% block scripts %}
|
||||||
{{ parent() }}
|
{{ parent() }}
|
||||||
<script type="text/javascript" src="{{ path('minifier', {'f': '/scripts/apps/login/home/register.js'}) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', {'f': '/scripts/apps/login/home/register.js'}) }}"></script>
|
||||||
<script>
|
|
||||||
// cross-browser asynchronous script loading for zxcvbn.
|
|
||||||
// adapted from http://friendlybit.com/js/lazy-loading-asyncronous-javascript/
|
|
||||||
(function() {
|
|
||||||
|
|
||||||
var ZXCVBN_SRC = 'assets/vendors/zxcvbn/zxcvbn{% if not app.debug %}.min{% endif %}.js';
|
|
||||||
|
|
||||||
var async_load = function() {
|
|
||||||
var first, s;
|
|
||||||
s = document.createElement('script');
|
|
||||||
s.src = ZXCVBN_SRC;
|
|
||||||
s.type = 'text/javascript';
|
|
||||||
s.async = true;
|
|
||||||
first = document.getElementsByTagName('script')[0];
|
|
||||||
return first.parentNode.insertBefore(s, first);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (window.attachEvent != null) {
|
|
||||||
window.attachEvent('onload', async_load);
|
|
||||||
} else {
|
|
||||||
window.addEventListener('load', async_load, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
}).call(this);
|
|
||||||
</script>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@@ -16,6 +16,7 @@ require.config({
|
|||||||
"jquery.ui": "../assets/vendors/jquery-ui/jquery-ui.min",
|
"jquery.ui": "../assets/vendors/jquery-ui/jquery-ui.min",
|
||||||
underscore: "../assets/vendors/underscore/underscore.min",
|
underscore: "../assets/vendors/underscore/underscore.min",
|
||||||
backbone: "../assets/vendors/backbone/backbone.min",
|
backbone: "../assets/vendors/backbone/backbone.min",
|
||||||
|
zxcvbn: "../assets/vendors/zxcvbn/zxcvbn.min",
|
||||||
"jquery.ui.widget": "../assets/vendors/jquery-file-upload/jquery.ui.widget.min",
|
"jquery.ui.widget": "../assets/vendors/jquery-file-upload/jquery.ui.widget.min",
|
||||||
"jquery.cookie": "../assets/vendors/jquery.cookie/jquery.cookie.min",
|
"jquery.cookie": "../assets/vendors/jquery.cookie/jquery.cookie.min",
|
||||||
"jquery.treeview": "../assets/vendors/jquery-treeview/jquery.treeview",
|
"jquery.treeview": "../assets/vendors/jquery-treeview/jquery.treeview",
|
||||||
|
@@ -13,8 +13,9 @@ require([
|
|||||||
"i18n",
|
"i18n",
|
||||||
"apps/login/home/common",
|
"apps/login/home/common",
|
||||||
"common/forms/views/formType/passwordSetter",
|
"common/forms/views/formType/passwordSetter",
|
||||||
"common/geonames"
|
"common/geonames",
|
||||||
], function ($, i18n, Common, RegisterForm, geonames) {
|
"common/forms/views/formType/zxcvbn"
|
||||||
|
], function ($, i18n, Common, RegisterForm, geonames, zxcvbn) {
|
||||||
var fieldsConfiguration = [];
|
var fieldsConfiguration = [];
|
||||||
|
|
||||||
$.when.apply($, [
|
$.when.apply($, [
|
||||||
@@ -100,7 +101,8 @@ require([
|
|||||||
|
|
||||||
new RegisterForm({
|
new RegisterForm({
|
||||||
el: $form,
|
el: $form,
|
||||||
rules: rules
|
rules: rules,
|
||||||
|
zxcvbn: zxcvbn
|
||||||
});
|
});
|
||||||
|
|
||||||
var geocompleter = geonames.init($("#geonameid"), {
|
var geocompleter = geonames.init($("#geonameid"), {
|
||||||
|
@@ -13,8 +13,9 @@ define([
|
|||||||
"i18n",
|
"i18n",
|
||||||
"backbone",
|
"backbone",
|
||||||
"bootstrap",
|
"bootstrap",
|
||||||
"common/forms/views/form"
|
"common/forms/views/form",
|
||||||
], function ($, _, i18n, Backbone, bootstrap, FormView) {
|
"common/forms/views/formType/zxcvbn"
|
||||||
|
], function ($, _, i18n, Backbone, bootstrap, FormView, zxcvbn) {
|
||||||
var PasswordSetterForm = FormView.extend({
|
var PasswordSetterForm = FormView.extend({
|
||||||
events: function () {
|
events: function () {
|
||||||
return _.extend({}, FormView.prototype.events, {
|
return _.extend({}, FormView.prototype.events, {
|
||||||
|
Reference in New Issue
Block a user