diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-19 19:13:31 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-19 19:13:31 +0300 |
commit | 1c75533d9cc0693733bacbadecfaac5c504313fb (patch) | |
tree | 865ca6cfc8f2ea136d7ff2462e435151e612d06d /netrender | |
parent | 4179941c58871bf85cf275130af0696affa5040f (diff) | |
parent | d7d3233715503ecc15b8dd1973f7e73257e2cbda (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'netrender')
-rw-r--r-- | netrender/js/jquery.js | 10 | ||||
-rw-r--r-- | netrender/js/netrender-widget.js | 2 | ||||
-rw-r--r-- | netrender/master.py | 2 | ||||
-rw-r--r-- | netrender/ui.py | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/netrender/js/jquery.js b/netrender/js/jquery.js index 8ccd0ea7..57692314 100644 --- a/netrender/js/jquery.js +++ b/netrender/js/jquery.js @@ -2278,7 +2278,7 @@ jQuery.fn.extend({ classNames = value.split( rspace ); while ( (className = classNames[ i++ ]) ) { - // check each className given, space seperated list + // check each className given, space separated list state = isBool ? state : !self.hasClass( className ); self[ state ? "addClass" : "removeClass" ]( className ); } @@ -3868,7 +3868,7 @@ var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[ rNonWord = /\W/; // Here we check if the JavaScript engine is using some sort of -// optimization where it does not always call our comparision +// optimization where it does not always call our comparison // function. If that is the case, discard the hasDuplicate value. // Thus far that includes Google Chrome. [0, 0].sort(function() { @@ -4180,7 +4180,7 @@ Sizzle.error = function( msg ) { }; /** - * Utility function for retreiving the text value of an array of DOM nodes + * Utility function for retrieving the text value of an array of DOM nodes * @param {Array|Element} elem */ var getText = Sizzle.getText = function( elem ) { @@ -7770,7 +7770,7 @@ function ajaxConvert( s, response ) { for ( i = 1; i < length; i++ ) { // Create converters map - // with lowercased keys + // with lowercase keys if ( i === 1 ) { for ( key in s.converters ) { if ( typeof key === "string" ) { @@ -8111,7 +8111,7 @@ if ( jQuery.support.ajax ) { xml; // Firefox throws exceptions when accessing properties - // of an xhr when a network error occured + // of an xhr when a network error occurred // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) try { diff --git a/netrender/js/netrender-widget.js b/netrender/js/netrender-widget.js index b69aadfe..66995389 100644 --- a/netrender/js/netrender-widget.js +++ b/netrender/js/netrender-widget.js @@ -105,7 +105,7 @@ function createPanelwidget(parent, name, header, content) { /* * create a jquery tabed widget * param; - * parent (string): parent elemenet selector in form of '#name' + * parent (string): parent element selector in form of '#name' * name (string ): name of the widget * tabs_descriptions: array of object { name:"tabs-1", f_content: function for display tab content} * f_content= function(name){} where name is the tab name diff --git a/netrender/master.py b/netrender/master.py index 92c46031..e9c76d5c 100644 --- a/netrender/master.py +++ b/netrender/master.py @@ -123,7 +123,7 @@ class MRenderJob(netrender.model.RenderJob): self.chunks = info_map["chunks"] def testStart(self): - # Don't test files for versionned jobs + # Don't test files for versioned jobs if not self.version_info: for f in self.files: if not f.test(): diff --git a/netrender/ui.py b/netrender/ui.py index 63553e29..bcd83197 100644 --- a/netrender/ui.py +++ b/netrender/ui.py @@ -422,7 +422,7 @@ class NetRenderSettings(bpy.types.PropertyGroup): default = False) NetRenderSettings.cert_path = StringProperty( name="CertPath", - description="Path to ssl certifcate", + description="Path to ssl certificate", maxlen = 128, default = "", subtype='FILE_PATH') |