Skip to content

Replaced jQuery old shorthand event methods with the new methods #125

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replaced jQuery old shorthand event methods with the new methods #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f965db
Replaced jQuery old shorthand event methods with the new methods.
adityatoshniwal Apr 20, 2018
3706d65
Changed this.$iFrame.trigger[0] to this.$iFrame.trigger
adityatoshniwal Apr 20, 2018
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
24 changes: 12 additions & 12 deletions Code/ThemeBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ define([

var $pull = $('<button style="width:100%;" title="Pull attributes from the currently active theme.">Pull</button>');
self._panel.layout().addItem($pull, 0, row).stretch('25%', '');
$pull.click(function () {
$pull.on('click',function () {
self._panel.startLoading();
setTimeout(function() {
var isMobile = $('body').hasClass('wcMobile');
Expand All @@ -155,7 +155,7 @@ define([

var $apply = $('<button class="wcCustomThemeApplied" style="width:100%;" title="Apply these attributes to the theme.">Apply</button>');
self._panel.layout().addItem($apply, 1, row).stretch('25%', '');
$apply.click(function () {
$apply.on('click',function () {
var themeData = self.build();
self.apply(themeData);
$apply.addClass('wcButtonActive');
Expand All @@ -168,7 +168,7 @@ define([

var $mobile = $('<button style="width:100%;" title="Toggle mobile theme overrides.">Mobile</button>');
self._panel.layout().addItem($mobile, 2, row).stretch('25%', '');
$mobile.click(function () {
$mobile.on('click',function () {
self._panel.startLoading();
setTimeout(function() {
self.buildControls(!showMobile);
Expand All @@ -183,7 +183,7 @@ define([

var $download = $('<button style="width:100%;" title="Download your custom theme.">Download</button>');
self._panel.layout().addItem($download, 3, row).stretch('25%', '');
$download.click(function () {
$download.on('click',function () {
var themeData = self.build();
var blob = new Blob([themeData], {type: "text/plain;charset=utf-8"});
saveAs(blob, "myTheme.css");
Expand Down Expand Up @@ -332,7 +332,7 @@ define([
$activator = this._lastCheckbox;
}

$activator.change(function () {
$activator.on('change',function () {
control[disabledProp] = !this.checked;
$control.spectrum(this.checked ? 'enable' : 'disable');
self.onChanged();
Expand Down Expand Up @@ -362,7 +362,7 @@ define([
$control = $('<input class="wcAttributeControl" title="' + control.info + '" type="text"/>');
layout.addItem($control, 2, row, 2).stretch('100%', '');
$control.val(control[valueProp]);
$control.change(function () {
$control.on('change',function () {
control[valueProp] = $(this).val();
if (!showMobile && control.isMobileDisabled) {
control.mobileValue = control.value;
Expand All @@ -380,7 +380,7 @@ define([
$activator = this._lastCheckbox;
}

$activator.change(function () {
$activator.on('change',function () {
control[disabledProp] = !this.checked;
$control.attr('disabled', !this.checked);
self.onChanged();
Expand Down Expand Up @@ -410,7 +410,7 @@ define([
$control = $('<input class="wcAttributeControl" title="' + control.info + '" type="number" step="1"/>');
layout.addItem($control, 2, row, 2).stretch('100%', '');
$control.val(parseInt(control[valueProp]));
$control.change(function () {
$control.on('change',function () {
control[valueProp] = $(this).val() + 'px';
if (!showMobile && control.isMobileDisabled) {
control.mobileValue = control.value;
Expand All @@ -428,7 +428,7 @@ define([
$activator = this._lastCheckbox;
}

$activator.change(function () {
$activator.on('change',function () {
control[disabledProp] = !this.checked;
$control.attr('disabled', !this.checked);
self.onChanged();
Expand Down Expand Up @@ -472,7 +472,7 @@ define([
$control.append($('<option value="' + value + '"' + (control[valueProp] === value ? ' selected' : '') + '>' + display + '</option>'));
}

$control.change(function () {
$control.on('change',function () {
control[valueProp] = $(this).val();
if (!showMobile && control.isMobileDisabled) {
control.mobileValue = control.value;
Expand All @@ -490,7 +490,7 @@ define([
$activator = this._lastCheckbox;
}

$activator.change(function () {
$activator.on('change',function () {
control[disabledProp] = !this.checked;
$control.attr('disabled', !this.checked);
self.onChanged();
Expand Down Expand Up @@ -822,7 +822,7 @@ define([
var $customTheme = $('#wcCustomTheme');
if ($customTheme.length) {
$('option.custom').hide();
$('.themeSelector').val('default').change();
$('.themeSelector').val('default').trigger('change');
$customTheme.remove();
}
});
Expand Down
4 changes: 2 additions & 2 deletions Code/docker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ define([
target = anchor.item._parent;
}
var newPanel = self.addPanel(key, anchor.loc, target, self._ghost.rect());
newPanel.focus();
newPanel.trigger('focus');
}
}
},
Expand Down Expand Up @@ -1824,7 +1824,7 @@ define([
var index = parseInt($panelTab.attr('id'));
self._draggingFrame.panel(index, true);
self._draggingFrameTab = $panelTab[0];
$(window).focus();
$(window).trigger('focus');
}

// If the window is able to be docked, give it a dark shadow tint and begin the movement process
Expand Down
2 changes: 1 addition & 1 deletion Code/frame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ define([
this.$frame.addClass('wcFloating');
}

this.$center.scroll(this.__scrolled.bind(this));
this.$center.on('scroll',this.__scrolled.bind(this));
},

// Updates the size of the frame.
Expand Down
29 changes: 19 additions & 10 deletions Code/iframe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,14 @@ define([
this.__updateFrame();
this._window.location.replace(url);

this.$iFrame[0].focus();
this.$iFrame.hover(this.__onHoverEnter.bind(this), this.__onHoverExit.bind(this));
this.$iFrame.trigger('focus');
this.$iFrame.on({
mouseenter:this.__onHoverEnter.bind(this),
mouseleave:this.__onHoverExit.bind(this)
});

var self = this;
this.$iFrame.load(function () {
this.$iFrame.on('load',function () {
for (var i = 0; i < self._onLoadFuncs.length; ++i) {
self._onLoadFuncs[i]();
}
Expand Down Expand Up @@ -107,11 +110,14 @@ define([
this._window.document.write(html);
this._window.document.close();

this.$iFrame[0].focus();
this.$iFrame.hover(this.__onHoverEnter.bind(this), this.__onHoverExit.bind(this));
this.$iFrame.trigger('focus');
this.$iFrame.on({
mouseenter:this.__onHoverEnter.bind(this),
mouseleave:this.__onHoverExit.bind(this)
});

var self = this;
this.$iFrame.load(function () {
this.$iFrame.on('load',function () {
for (var i = 0; i < self._onLoadFuncs.length; ++i) {
self._onLoadFuncs[i]();
}
Expand All @@ -137,11 +143,14 @@ define([

// Write the frame source.
this.$iFrame[0].srcdoc = html;
this.$iFrame[0].focus();
this.$iFrame.hover(this.__onHoverEnter.bind(this), this.__onHoverExit.bind(this));
this.$iFrame.trigger('focus');
this.$iFrame.on({
mouseenter:this.__onHoverEnter.bind(this),
mouseleave:this.__onHoverExit.bind(this)
});

var self = this;
this.$iFrame.load(function () {
this.$iFrame.on('load',function () {
for (var i = 0; i < self._onLoadFuncs.length; ++i) {
self._onLoadFuncs[i]();
}
Expand Down Expand Up @@ -249,7 +258,7 @@ define([
this._panel.on(this._boundEvents[i].event, this._boundEvents[i].handler);
}

$(window).blur(this.__onBlur.bind(this));
$(window).on('blur',this.__onBlur.bind(this));
},

__clearFrame: function () {
Expand Down