April 2015 - Sandbox-commits - mailman.cloud.codelutin.com

r1183 - wit
by echatellier＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: echatellier Date: 2015-04-15 10:06:45 +0000 (Wed, 15 Apr 2015) New Revision: 1183 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1183 Log: Add gruntfile Added: wit/gruntfile.js Modified: wit/ wit/package.json Property changes on: wit ___________________________________________________________________ Added: svn:ignore + cache webkitbuilds node_modules nbproject Added: wit/gruntfile.js =================================================================== --- wit/gruntfile.js (rev 0) +++ wit/gruntfile.js 2015-04-15 10:06:45 UTC (rev 1183) @@ -0,0 +1,21 @@ +module.exports = function(grunt) { + + + grunt.initOptions = function(options){ + + + }; + + grunt.initConfig({ + nodewebkit: { + options: { + platforms: ['win','osx',"linux"], + buildDir: './webkitbuilds', // Where the build version of my node-webkit app is saved + }, + src: ['./index.html', "./package.json", "./css/**", "./js/**"] // Your node-webkit app + }, + }) + + grunt.loadNpmTasks('grunt-node-webkit-builder'); + grunt.registerTask('default', ['nodewebkit']); +}; Modified: wit/package.json =================================================================== --- wit/package.json 2015-04-15 09:54:39 UTC (rev 1182) +++ wit/package.json 2015-04-15 10:06:45 UTC (rev 1183) @@ -1,8 +1,13 @@ { "name": "wit", "main": "index.html", + "version": "1.0.0", "window": { "width": 300, "height": 300 + }, + "devDependencies": { + "grunt": "^0.4.5", + "grunt-node-webkit-builder": "^1.0.2" } }

1 0

r1182 - in wit: . css js
by jruchaud＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: jruchaud Date: 2015-04-15 09:54:39 +0000 (Wed, 15 Apr 2015) New Revision: 1182 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1182 Log: create structure Added: wit/css/ wit/css/style.css wit/js/ wit/js/main.js Modified: wit/index.html Added: wit/css/style.css =================================================================== Modified: wit/index.html =================================================================== --- wit/index.html 2015-04-15 09:48:11 UTC (rev 1181) +++ wit/index.html 2015-04-15 09:54:39 UTC (rev 1182) @@ -1,13 +1,15 @@ <!DOCTYPE html> <html> - <head> - <title>WIT</title> - </head> - <body> - <div id="tags"> - <div>wit</div> - <div>js</div> - <div>dev</div> - </div> - </body> + <head> + <title>WIT</title> + <link type="text/css" href="css/style.css"/> + <script type="application/javascript" src="js/main.js"></script> + </head> + <body> + <div id="tags"> + <div>wit</div> + <div>js</div> + <div>dev</div> + </div> + </body> </html> Added: wit/js/main.js ===================================================================

1 0

r1181 - wit
by jruchaud＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: jruchaud Date: 2015-04-15 09:48:11 +0000 (Wed, 15 Apr 2015) New Revision: 1181 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1181 Log: Remove Removed: wit/svn-commit.tmp Deleted: wit/svn-commit.tmp =================================================================== --- wit/svn-commit.tmp 2015-04-15 09:46:04 UTC (rev 1180) +++ wit/svn-commit.tmp 2015-04-15 09:48:11 UTC (rev 1181) @@ -1,4 +0,0 @@ -Create wit ---Cette ligne, et les suivantes ci-dessous, seront ignorées-- - -A .

1 0

r1180 - / wit
by jruchaud＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: jruchaud Date: 2015-04-15 09:46:04 +0000 (Wed, 15 Apr 2015) New Revision: 1180 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1180 Log: Initial Added: wit/ wit/index.html wit/package.json wit/svn-commit.tmp Added: wit/index.html =================================================================== --- wit/index.html (rev 0) +++ wit/index.html 2015-04-15 09:46:04 UTC (rev 1180) @@ -0,0 +1,13 @@ +<!DOCTYPE html> +<html> + <head> + <title>WIT</title> + </head> + <body> + <div id="tags"> + <div>wit</div> + <div>js</div> + <div>dev</div> + </div> + </body> +</html> Added: wit/package.json =================================================================== --- wit/package.json (rev 0) +++ wit/package.json 2015-04-15 09:46:04 UTC (rev 1180) @@ -0,0 +1,8 @@ +{ + "name": "wit", + "main": "index.html", + "window": { + "width": 300, + "height": 300 + } +} Added: wit/svn-commit.tmp =================================================================== --- wit/svn-commit.tmp (rev 0) +++ wit/svn-commit.tmp 2015-04-15 09:46:04 UTC (rev 1180) @@ -0,0 +1,4 @@ +Create wit +--Cette ligne, et les suivantes ci-dessous, seront ignorées-- + +A .

1 0

r1179 - oipf/js/impl/model
by ygrego＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: ygrego Date: 2015-04-15 08:21:11 +0000 (Wed, 15 Apr 2015) New Revision: 1179 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1179 Log: The method "_abortIfNecessary" is called in method "findProgrammesFromStream", "setQuery", "addChannelConstraint" and "addRatingConstraint". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-15 08:07:12 UTC (rev 1178) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-15 08:21:11 UTC (rev 1179) @@ -188,6 +188,8 @@ ("This function cannot be called with these arguments."); } + this._abortIfNecessary(); + console.log("[INFO]: findProgrammesFromStream [IN]"); this.addChannelConstraint(channel); this._currentQuery = new Query("startTime", 0, startTime, count); @@ -223,6 +225,8 @@ ("This function cannot be called with this argument."); } + + this._abortIfNecessary(); this._currentQuery = query; }, @@ -263,6 +267,8 @@ } + this._abortIfNecessary(); + if (this._constraints.channels) { this._constraints.channels = this._constraints.channels.concat(channels); @@ -287,6 +293,8 @@ * rating scheme SHALL be cleared. */ addRatingConstraint: function(scheme, threshold) { + this._abortIfNecessary(); + if (scheme && threshold) { var rating = { scheme: scheme,

1 0

r1178 - oipf/js/impl/model
by ygrego＠users.nuiton.org 15 Apr '15

15 Apr '15

Author: ygrego Date: 2015-04-15 08:07:12 +0000 (Wed, 15 Apr 2015) New Revision: 1178 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1178 Log: Addition of property "_fireEventModified" and method "_abortIfNecessary". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-14 15:41:19 UTC (rev 1177) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-15 08:07:12 UTC (rev 1178) @@ -138,6 +138,10 @@ ratings: [] }; this._ordering = []; + + this._fireEventModified = this._searchManager + ._fireEventModified.bind(this._searchManager); + }, /* @@ -393,6 +397,13 @@ _removeOrdering: function() { this._ordering = null; + }, + + _abortIfNecessary: function() { + if (this.result._timerManager.timer) { + this.result.abort(); + this._fireEventModified(this); + } } }); \ No newline at end of file

1 0

r1177 - oipf/js/impl/model
by ygrego＠users.nuiton.org 14 Apr '15

14 Apr '15

Author: ygrego Date: 2015-04-14 15:41:19 +0000 (Tue, 14 Apr 2015) New Revision: 1177 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1177 Log: Deletion of internal constants. Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-14 14:24:57 UTC (rev 1176) +++ oipf/js/impl/model/SearchResults.js 2015-04-14 15:41:19 UTC (rev 1177) @@ -15,13 +15,7 @@ * access the results in this collection. */ var SearchResults = Array.extend({ - - SEARCH_FINISHED: 0, - - SEARCH_MODIFIED: 3, - - SEARCH_CANNOT_BE_COMPLETED: 4, - + /* * Description: * The number of items in the current window within the overall result set. The value of this property SHALL be

1 0

r1176 - oipf/js/impl/model
by ygrego＠users.nuiton.org 14 Apr '15

14 Apr '15

Author: ygrego Date: 2015-04-14 14:24:57 +0000 (Tue, 14 Apr 2015) New Revision: 1176 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1176 Log: Addition of new methods: "_fireEventFinished" and "_fireEventUncompleted". These one are called in method "getResults" and "getResultFromInterval". Deletion of property "_fireEvent". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-14 14:20:47 UTC (rev 1175) +++ oipf/js/impl/model/SearchResults.js 2015-04-14 14:24:57 UTC (rev 1176) @@ -62,9 +62,13 @@ this._search = search; this.length = 0; this.totalSize = 0; - this._fireEvent = this._search._searchManager - ._fireEvent.bind(this._search._searchManager); + + this._fireEventUncompleted = this._search._searchManager + ._fireEventUncompleted.bind(this._search._searchManager); + this._fireEventFinished = this._search._searchManager + ._fireEventFinished.bind(this._search._searchManager); + }, _methodToCall: { @@ -132,8 +136,7 @@ } } else { - this._fireEvent(createCustomEvent("MetadataSearch", - [this._search, this.SEARCH_CANNOT_BE_COMPLETED])); + this._fireEventUncompleted(this._search); } return false; @@ -186,8 +189,8 @@ console.log("[Info]No results found."); } } - this._fireEvent(createCustomEvent("MetadataSearch", - [this._search, this.SEARCH_FINISHED])); + + this._fireEventFinished(this._search); this.totalSize = this._cachedResults.length; } },

1 0

r1175 - oipf/js/test
by ygrego＠users.nuiton.org 14 Apr '15

14 Apr '15

Author: ygrego Date: 2015-04-14 14:20:47 +0000 (Tue, 14 Apr 2015) New Revision: 1175 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1175 Log: Modification of method "testGetCurrentProgrammeFromNullStream" in order to catch an expected error. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-14 14:12:36 UTC (rev 1174) +++ oipf/js/test/SearchManagerTest.js 2015-04-14 14:20:47 UTC (rev 1175) @@ -324,38 +324,15 @@ var metaDataSearch = self.searchManagerObj.createSearch(searchTarget); var currentChannel = null; var startTime = null; - metaDataSearch.findProgrammesFromStream(currentChannel, startTime); - var offset = 0; - var count = 1; - metaDataSearch.result.getResults(offset, count); -// console.log(metaDataSearch.result[0]);//Must return undefined else wrong implementation of getResults method + new Promise(function (resolve, reject) { + metaDataSearch.findProgrammesFromStream(currentChannel, startTime); + }) + .catch(function(val) { + console.log(val); + resolve(); + }); }); - this.searchManagerObj.onMetadataSearch = function(search, state) { - - console.log("[INFO]: onMetadataSearch called"); - - switch (state) { - - case 4: - message = "The search cannot be complete."; - console.log(message); - if (search.result.length == 0) { - console.log("State: Ok."); - resolve(); - } else { - console.log("State: Unexpected."); - reject(); - } - break; - - default: - console.log("Unknow state"); - reject(); - - } - }; - this.vidBroadObj.bindToCurrentChannel(); },

1 0

r1174 - oipf/js/impl/model
by ygrego＠users.nuiton.org 14 Apr '15

14 Apr '15

Author: ygrego Date: 2015-04-14 14:12:36 +0000 (Tue, 14 Apr 2015) New Revision: 1174 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1174 Log: Deletion of a term in condition of "else if". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-14 13:43:09 UTC (rev 1173) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-14 14:12:36 UTC (rev 1174) @@ -252,7 +252,7 @@ this._constraints.channels.length = 0; } else if (!(channels instanceof ChannelList) && - !(channels instanceof Channel) || channels != null) { + !(channels instanceof Channel)) { throw new TypeError ("This function cannot be called with this argument.");

1 0