Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MERGE] website, *: make website JS available in all 'frontend' pages #29442

Closed
wants to merge 10 commits into from
Closed

[MERGE] website, *: make website JS available in all 'frontend' pages #29442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
727f740
[MOV] web, *: simple moves of JS files to 'public' folder
qsm-odoo Feb 13, 2019
8acc9ee
[REF] website: split WebsiteRoot definition / instantiation
qsm-odoo Feb 13, 2019
de41362
[REF] website, web, *: move part of website into web
qsm-odoo Dec 11, 2018
65bd608
[FIX] web: consider the body when there is no wrapwrap
qsm-odoo Feb 7, 2019
031d23d
[REF] website: make the lazy renderer a public widget
qsm-odoo Feb 4, 2019
b653a16
[REF] *: use 'frontend' system in non-website apps
qsm-odoo Feb 6, 2019
53e0b02
[REF] website, *: move and review the notion of edit mode
qsm-odoo Feb 7, 2019
7a7c2a5
[REF] website, *: use public widgets instead of website animations
qsm-odoo Feb 12, 2019
6df47dc
[REF] website, *: stop using 'animation' confusing name
qsm-odoo Feb 12, 2019
c3a8d96
[REF] *: definitely get rid of web_editor.base
qsm-odoo Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 8 additions & 26 deletions addons/account/static/src/js/account_portal_sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,25 @@
odoo.define('account.AccountPortalSidebar.instance', function (require) {
"use strict";

require('web.dom_ready');
var AccountPortalSidebar = require('account.AccountPortalSidebar');

if (!$('.o_portal_invoice_sidebar').length) {
return $.Deferred().reject("DOM doesn't contain '.o_portal_invoice_sidebar'");
}

var account_portal_sidebar = new AccountPortalSidebar();
return account_portal_sidebar.attachTo($('.o_portal_invoice_sidebar')).then(function () {
return account_portal_sidebar;
});
});

//==============================================================================

odoo.define('account.AccountPortalSidebar', function (require) {
"use strict";
'use strict';

var publicWidget = require('web.public.widget');
var PortalSidebar = require('portal.PortalSidebar');

var AccountPortalSidebar = PortalSidebar.extend({
publicWidget.registry.AccountPortalSidebar = PortalSidebar.extend({
selector: '.o_portal_invoice_sidebar',
events: {
'click .o_portal_invoice_print': '_onPrintInvoice',
},

/**
* @override
*/
start: function () {
var self = this;
this._super.apply(this, arguments);
var def = this._super.apply(this, arguments);
var $invoiceHtml = this.$el.find('iframe#invoice_html');
var updateIframeSize = self._updateIframeSize.bind(self, $invoiceHtml);
var updateIframeSize = this._updateIframeSize.bind(this, $invoiceHtml);
$invoiceHtml.on('load', updateIframeSize);
$(window).on('resize', updateIframeSize);
return def;
},

//--------------------------------------------------------------------------
Expand Down Expand Up @@ -64,7 +49,4 @@ var AccountPortalSidebar = PortalSidebar.extend({
this._printIframeContent(href);
},
});


return AccountPortalSidebar;
});
29 changes: 19 additions & 10 deletions addons/auth_signup/static/src/js/signup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
odoo.define('auth_signup.signup', function (require) {
'use strict';
'use strict';

require('web.dom_ready');
var publicWidget = require('web.public.widget');

// Disable 'Sign Up' button to prevent user form continuous clicking
if ($('.oe_signup_form').length > 0) {
$('.oe_signup_form').on('submit', function (ev) {
var $form = $(ev.currentTarget);
var $btn = $form.find('.oe_login_buttons > button[type="submit"]');
publicWidget.registry.SignUpForm = publicWidget.Widget.extend({
selector: '.oe_signup_form',
events: {
'submit': '_onSubmit',
},

//--------------------------------------------------------------------------
// Handlers
//--------------------------------------------------------------------------

/**
* @private
*/
_onSubmit: function () {
var $btn = this.$('.oe_login_buttons > button[type="submit"]');
$btn.attr('disabled', 'disabled');
$btn.prepend('<i class="fa fa-refresh fa-spin"/> ');
});
}

},
});
});
4 changes: 3 additions & 1 deletion addons/im_livechat/views/im_livechat_channel_templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@
<script type="text/javascript" src="/web/static/src/js/core/local_storage.js"></script>
<script type="text/javascript" src="/web/static/src/js/core/ram_storage.js"></script>
<script type="text/javascript" src="/web/static/src/js/core/abstract_storage_service.js"></script>
<script type="text/javascript" src="/web/static/src/js/chrome/public_root_widget.js"></script>
<script type="text/javascript" src="/web/static/src/js/public/public_root.js"/>
<script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"/>
<script type="text/javascript" src="/web/static/src/js/public/public_widget.js"/>
<script type="text/javascript" src="/web/static/src/js/services/ajax_service.js"></script>
<script type="text/javascript" src="/web/static/src/js/services/local_storage_service.js"></script>
<!-- Bus, Mail, Livechat -->
Expand Down
Loading