Skip to content

Fix implicit globals and remove dead code in core/js #3298

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

Closed
limad wants to merge 1 commit into from
Closed

Fix implicit globals and remove dead code in core/js #3298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion core/js/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function getTemplate(_folder, _version, _filename, _replace) {
success: function(data) {
if (isset(_replace) && _replace != null) {
var reg = null;
for (i in _replace) {
for (var i in _replace) {
reg = new RegExp(i, "g");
data = data.replace(reg, _replace[i]);
}
Expand Down
1 change: 0 additions & 1 deletion core/js/private.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ jeedom.private.checkAndGetParams = function(_params, _paramsSpecifics, _paramsRe
var params = domUtils.extend({}, jeedom.private.default_params, _paramsSpecifics, _params || {});

//Convert all objects in params to json
var param = null;
for (var attr in params) {
params[attr] = (typeof params[attr] == 'object') ? JSON.stringify(params[attr]) : params[attr];
}
Expand Down
4 changes: 2 additions & 2 deletions core/js/view.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jeedom.view.toHtml = function(_params) {
var paramsRequired = ['id', 'version'];
var paramsSpecifics = {
pre_success: function(data) {
result = jeedom.view.handleViewAjax({
var result = jeedom.view.handleViewAjax({
view: data.result
});
result.raw = data.result;
Expand Down Expand Up @@ -135,7 +135,7 @@ jeedom.view.handleViewAjax = function(_params) {
for (var j in viewZone.viewData) {
viewData = viewZone.viewData[j];
configuration = JSON.stringify(viewData.configuration);
option = configuration.replace(/"/g, "'");
var option = configuration.replace(/"/g, "'");
result.html += '<div class="viewZoneData hidden" data-cmdId="'+viewData.link_id+'" data-option="'+option+'" data-el="'+div_id+'" data-height="'+viewZone.configuration.height+'" data-dateRange="'+viewZone.configuration.dateRange+'"></div>';
}
result.html += '</div>';
Expand Down
Loading