Skip to content
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.

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

Add full montage-data repo to montage/data/ directory #1846

Merged
merged 68 commits into from
Aug 10, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
e80f024
implement jsdoc.json and new jsdoc generation
hthetiot Apr 3, 2017
f4ca21c
jshint ui
hthetiot Jun 23, 2017
baafdbe
jshint window-loader
hthetiot Jun 23, 2017
27dee25
jshint ui
hthetiot Jun 23, 2017
6010330
jshint converter
hthetiot Jun 23, 2017
7654988
jshint ui/base
hthetiot Jun 26, 2017
f010cb2
jshint ui/
hthetiot Jun 26, 2017
ee399c9
jshint composer/
hthetiot Jun 26, 2017
6ca4fa6
jshint core/serialization
hthetiot Jun 26, 2017
2e95232
lint core/promise
hthetiot Jun 26, 2017
c9ecd65
update jshint settings
hthetiot Jun 26, 2017
856f378
jshint core/converter/
hthetiot Jun 26, 2017
7aca69a
jshint core/
hthetiot Jun 26, 2017
d7f938e
jshint core/
hthetiot Jun 26, 2017
bf38fbb
jshint composer
hthetiot Jun 26, 2017
7c01364
jshint montage core/uuid
hthetiot Jun 26, 2017
600a6fe
jshint node.js
hthetiot Jun 26, 2017
44b3d0f
jshint core/messageformat
hthetiot Jun 26, 2017
6909f55
fix spec
hthetiot Jun 28, 2017
034492a
jshint
hthetiot Jul 10, 2017
44d36ca
jshint
hthetiot Jul 10, 2017
27eb5c1
jshint
hthetiot Jul 10, 2017
425c63c
jshint
hthetiot Jul 10, 2017
9e709f0
jshint ui/component.js
hthetiot Jul 10, 2017
ba8bef2
Merge branch 'master' into jshint
hthetiot Jul 11, 2017
1f4c34e
fix bad merge from master
hthetiot Jul 11, 2017
7ceadd5
fix jshint regression
hthetiot Jul 11, 2017
83e2bf4
add cmd to travis
hthetiot Jul 11, 2017
10e5c65
jshint core/core.js
hthetiot Jul 11, 2017
74df557
jshint core/core.js
hthetiot Jul 11, 2017
4c6061a
merge master
hthetiot Jul 11, 2017
c0964fc
jshint core/core.js
hthetiot Jul 11, 2017
dfd731e
jshint
hthetiot Jul 11, 2017
6f8db26
Merge branch 'master' into jshint
hthetiot Jul 11, 2017
3b64ac5
merge master
hthetiot Jul 11, 2017
199ec26
jshint
hthetiot Jul 11, 2017
580710f
jshint
hthetiot Jul 11, 2017
dca0bc6
jshint
hthetiot Jul 11, 2017
7366b52
add jshint dev dependency
hthetiot Jul 11, 2017
bdfa6ac
restore jshint eqeqeq and forin to true
hthetiot Jul 11, 2017
cfd2583
jshint
hthetiot Jul 11, 2017
39a0643
Merge branch 'master' into jshint
hthetiot Jul 13, 2017
b4225f0
jshint
hthetiot Jul 18, 2017
1f62c69
jshint
hthetiot Jul 18, 2017
82fc399
jshint core/serialization
hthetiot Jul 18, 2017
69acd92
jshint
hthetiot Jul 18, 2017
b3373c6
jshint
hthetiot Jul 18, 2017
f00b9d1
Merge branch 'jshint' of github.com:montagejs/montage into jshint
hthetiot Jul 18, 2017
91a7a65
fix bad merge on .jshintrc
hthetiot Jul 18, 2017
94694b2
jshint refactor empty loops and blocks
hthetiot Jul 18, 2017
d7520f1
last jshint pass
hthetiot Jul 18, 2017
3572965
merge master
hthetiot Jul 18, 2017
6c1650d
jshint master
hthetiot Jul 18, 2017
a6f3a91
moar jshint
hthetiot Jul 18, 2017
5c73df4
fix bad regexp
hthetiot Jul 19, 2017
9f00282
merge master
hthetiot Jul 19, 2017
73483cf
fix jshint regression
hthetiot Jul 19, 2017
2e3fd4a
merge master
hthetiot Jul 19, 2017
d2f38b4
jshint and allow node on core/application
hthetiot Jul 26, 2017
abff19e
Merge branch 'master' into jshint
hthetiot Jul 26, 2017
7c781d3
merge develop
hthetiot Aug 7, 2017
dedd121
update npm run jsdoc
hthetiot Aug 7, 2017
75d2bf7
fix jsdoc error
hthetiot Aug 7, 2017
d2eeef0
merge jsdoc
hthetiot Aug 7, 2017
b83cd68
fix jsdoc
hthetiot Aug 7, 2017
892f8e9
Merge pull request #1830 from montagejs/jshint
hthetiot Aug 7, 2017
e05eb74
Add documentation to pipeline-converter & property-descriptor
Aug 8, 2017
496c4e5
Add entire Montage Data repo
Aug 10, 2017
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
Prev Previous commit
Next Next commit
jshint window-loader
  • Loading branch information
hthetiot committed Jun 23, 2017
commit baafdbeb93bb4e615739da4bb27d09df3747f88c
8 changes: 4 additions & 4 deletions window-loader/montage-window.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var Montage = require("../core/core").Montage;
* @class MontageWindow
* @extends Montage
*/
var MontageWindow = exports.MontageWindow = Montage.specialize( /** @lends MontageWindow.prototype # */ {
exports.MontageWindow = Montage.specialize( /** @lends MontageWindow.prototype # */ {

_application: {
value: null
Expand Down Expand Up @@ -136,10 +136,10 @@ var MontageWindow = exports.MontageWindow = Montage.specialize( /** @lends Monta
if (theWindow.window === aWindow) {
if (theWindow.focused !== true) {
theWindow.focused = true;
if (application.windowsSortOrder == "z-order") {
if (application.windowsSortOrder === "z-order") {
windows.splice(i, 1);
windows.unshift(theWindow);
} else if (application.windowsSortOrder == "reverse-z-order") {
} else if (application.windowsSortOrder === "reverse-z-order") {
windows.splice(i, 1);
windows.push(theWindow);
}
Expand Down Expand Up @@ -241,7 +241,7 @@ var MontageWindow = exports.MontageWindow = Montage.specialize( /** @lends Monta

// Close the attached windows
application.attachedWindows = []; // this is necessary to prevent the unload of the child window to mess with the array while we iterate it
for (var i in attachedWindows) {
for (i in attachedWindows) {
attachedWindows[i].close();
}

Expand Down
8 changes: 4 additions & 4 deletions window-loader/window-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ require.loadPackage(parentWindow.require.location)
window.require = window.mr = require;

return require.async("montage/ui/component")
.then(function (exports) {
.then(function (/*exports*/) {
return require.async("montage/ui/loader.reel")
.then(function (exports) {
var mainComponent = exports["Loader"].create();
var mainComponent = exports.Loader.create();
mainComponent.mainModule = module;
mainComponent.mainName = name;
mainComponent.element = window.document.body;
mainComponent.attachToParentComponent();
mainComponent.needsDraw = true;

if (callback) {
mainComponent.addEventListener("componentLoaded", function (event) {
mainComponent.removeEventListener("componentLoaded", arguments.callee);
mainComponent.addEventListener("componentLoaded", function componentLoaded(event) {
mainComponent.removeEventListener("componentLoaded", componentLoaded);
callback(window, event.detail);
});
}
Expand Down