loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Revert "Merge branch 'master' of https://github.com/devcode-it/openstamanager" 

This reverts commit db4b1969c7, reversing
changes made to 82a11b30a3.
This commit is contained in:
Luca 2017-11-15 18:13:04 +01:00
parent db4b1969c7
commit 6ff6dbf314
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/src/js/custom.js
View File

@ -35,7 +35,7 @@ $(document).ready(function () {
}); });
} }
//if this isn't a link, prevent the page from being redirected //if this isn't a link, prevent the page from being redirected
if (checkElement.is('.treeview-menu') && $(e.target).is('.pull-right-container')) { if (checkElement.is('.treeview-menu') && $(event.target).is('.pull-right-container')) {
e.preventDefault(); e.preventDefault();
} }
}); });

2
package.json
View File

@ -54,7 +54,7 @@
"moment": "^2.18.1", "moment": "^2.18.1",
"numeral": "^2.0.6", "numeral": "^2.0.6",
"parsleyjs": "^2.7.2", "parsleyjs": "^2.7.2",
"select2": "4.0.3", "select2": "^4.0.3",
"select2-bootstrap-theme": "^0.1.0-beta.10", "select2-bootstrap-theme": "^0.1.0-beta.10",
"signature_pad": "^2.1.1", "signature_pad": "^2.1.1",
"smartwizard": "^4.2.2", "smartwizard": "^4.2.2",