Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
renderjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
renderjs
Commits
524e83b7
Commit
524e83b7
authored
Nov 19, 2013
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Readd support for iframe gadget.
parent
9a2ca855
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
556 additions
and
43 deletions
+556
-43
examples/officejs/jqteditor.html
examples/officejs/jqteditor.html
+1
-0
examples/officejs/officejs.js
examples/officejs/officejs.js
+6
-18
renderjs.js
renderjs.js
+263
-17
test/embedded.html
test/embedded.html
+15
-0
test/embedded.js
test/embedded.js
+24
-0
test/renderjs_test.js
test/renderjs_test.js
+247
-8
No files found.
examples/officejs/jqteditor.html
View file @
524e83b7
...
...
@@ -6,6 +6,7 @@
<script
src=
"../../lib/rsvp/rsvp.js"
type=
"text/javascript"
></script>
<script
src=
"../../lib/jschannel/jschannel.js"
type=
"text/javascript"
></script>
<script
src=
"../../renderjs.js"
type=
"text/javascript"
></script>
<script
src=
"../../lib/jquery/jquery.js"
type=
"text/javascript"
></script>
<script
src=
"jqte/jquery-te-1.4.0.js"
type=
"text/javascript"
></script>
<script
src=
"jqteditor.js"
type=
"text/javascript"
></script>
<link
rel=
"http://www.renderjs.org/rel/interface"
...
...
examples/officejs/officejs.js
View file @
524e83b7
...
...
@@ -47,24 +47,14 @@
}
function
createLoadNewEditorCallback
(
g
,
editor_path
,
e_c
,
io_path
,
i_c
)
{
// throw new Error("nutnut");
console
.
log
(
"
createLoadNewEditorCallback
"
);
return
function
()
{
// var new_element = document.createElement("div");
// // console.log(e_c);
// // e_c[0].innerHTML = '';
e_c
.
empty
();
// e_c[0].appendChild(new_element);
console
.
log
(
"
inside
"
);
return
RSVP
.
all
([
g
.
declareGadget
(
editor_path
,
{
element
:
e_c
[
0
]}),
// g.declareGadget(editor_path),
g
.
declareGadget
(
editor_path
,
{
element
:
e_c
[
0
],
sandbox
:
'
iframe
'
}),
g
.
declareGadget
(
io_path
),
"
officejs
"
])
.
then
(
function
(
all_param
)
{
// e_c.empty();
// e_c[0].appendChild(all_param[0].element);
i_c
.
empty
();
i_c
[
0
].
appendChild
(
all_param
[
1
].
element
);
return
attachIOToEditor
(
all_param
);
...
...
@@ -101,18 +91,16 @@
i
;
// Load 1 editor and 1 IO and plug them
console
.
log
(
io_list
[
0
].
path
);
editor_a_context
.
empty
(
);
return
RSVP
.
all
([
g
.
declareGadget
(
editor_list
[
0
].
path
),
// editor_a_context),
g
.
declareGadget
(
editor_list
[
0
].
path
,
{
element
:
editor_a_context
[
0
],
sandbox
:
'
iframe
'
}
),
g
.
declareGadget
(
io_list
[
0
].
path
),
// io_a_context),
"
officejs
"
])
.
then
(
function
(
all_param
)
{
editor_a_context
.
empty
();
console
.
log
(
"
first G
"
);
console
.
log
(
all_param
[
0
].
element
);
editor_a_context
[
0
].
appendChild
(
all_param
[
0
].
element
);
console
.
log
(
editor_a_context
[
0
]);
io_a_context
.
empty
();
io_a_context
[
0
].
appendChild
(
all_param
[
1
].
element
);
return
attachIOToEditor
(
all_param
);
...
...
renderjs.js
View file @
524e83b7
This diff is collapsed.
Click to expand it.
test/embedded.html
0 → 100644
View file @
524e83b7
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<title>
Embedded page for renderJS test
</title>
<meta
name=
"viewport"
content=
"width=device-width, height=device-height"
/>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
/>
<script
src=
"../lib/rsvp/rsvp.js"
type=
"text/javascript"
></script>
<script
src=
"../../lib/jschannel/jschannel.js"
type=
"text/javascript"
></script>
<script
src=
"../renderjs.js"
type=
"text/javascript"
></script>
<script
src=
"./embedded.js"
type=
"text/javascript"
></script>
</head>
<body>
</body>
</html>
test/embedded.js
0 → 100644
View file @
524e83b7
/*global window, rJS */
"
use strict
"
;
(
function
(
window
,
rJS
)
{
var
gk
=
rJS
(
window
),
ready_called
=
false
;
gk
.
ready
(
function
(
g
)
{
ready_called
=
true
;
})
.
declareMethod
(
'
wasReadyCalled
'
,
function
()
{
return
ready_called
;
})
.
declareMethod
(
'
triggerError
'
,
function
(
value
)
{
throw
new
Error
(
"
Manually triggered embedded error
"
);
})
.
declareMethod
(
'
setContent
'
,
function
(
value
)
{
rJS
(
this
).
embedded_property
=
value
;
})
.
declareMethod
(
'
getContent
'
,
function
()
{
return
rJS
(
this
).
embedded_property
;
});
}(
window
,
rJS
));
test/renderjs_test.js
View file @
524e83b7
/*jslint indent: 2, maxerr: 3, maxlen: 79 */
/*global window, document, QUnit, jQuery, renderJS, RenderJSGadget, sinon,
RSVP, DOMParser */
/*jslint unparam: true
, maxlen: 150
*/
RSVP, DOMParser
, RenderJSIframeGadget, RenderJSEmbeddedGadget
*/
/*jslint unparam: true */
"
use strict
"
;
(
function
(
document
,
$
,
renderJS
,
QUnit
,
sinon
)
{
...
...
@@ -41,8 +41,8 @@
}
});
test
(
'
Not valid HTML string
'
,
function
()
{
// Check that parseGadgetHTMLDocument returns the default value
if the string is
// not a valid xml
// Check that parseGadgetHTMLDocument returns the default value
//
if the string is
not a valid xml
deepEqual
(
parseGadgetHTML
(
""
),
{
title
:
""
,
interface_list
:
[],
...
...
@@ -1296,7 +1296,89 @@
});
/////////////////////////////////////////////////////////////////
// RenderJSGadget.declareGadget
// RenderJSIframeGadget
/////////////////////////////////////////////////////////////////
module
(
"
RenderJSIframeGadget
"
);
test
(
'
should be a constructor
'
,
function
()
{
var
gadget
=
new
RenderJSIframeGadget
();
equal
(
Object
.
getPrototypeOf
(
gadget
),
RenderJSIframeGadget
.
prototype
,
'
[[Prototype]] equals RenderJSIframeGadget.prototype
'
);
equal
(
gadget
.
constructor
,
RenderJSIframeGadget
,
'
constructor property of instances is set correctly
'
);
equal
(
RenderJSIframeGadget
.
prototype
.
constructor
,
RenderJSIframeGadget
,
'
constructor property of prototype is set correctly
'
);
});
test
(
'
should not accept parameter
'
,
function
()
{
equal
(
RenderJSIframeGadget
.
length
,
0
);
});
test
(
'
should work without new
'
,
function
()
{
var
gadgetKlass
=
RenderJSIframeGadget
,
gadget
=
gadgetKlass
();
equal
(
gadget
.
constructor
,
RenderJSIframeGadget
,
'
constructor property of instances is set correctly
'
);
ok
(
gadget
instanceof
RenderJSGadget
);
ok
(
gadget
instanceof
RenderJSIframeGadget
);
ok
(
RenderJSIframeGadget
!==
RenderJSGadget
);
});
/////////////////////////////////////////////////////////////////
// RenderJSEmbeddedGadget
/////////////////////////////////////////////////////////////////
module
(
"
RenderJSEmbeddedGadget
"
);
test
(
'
should be a constructor
'
,
function
()
{
var
gadget
=
new
RenderJSEmbeddedGadget
();
equal
(
Object
.
getPrototypeOf
(
gadget
),
RenderJSEmbeddedGadget
.
prototype
,
'
[[Prototype]] equals RenderJSEmbeddedGadget.prototype
'
);
equal
(
gadget
.
constructor
,
RenderJSEmbeddedGadget
,
'
constructor property of instances is set correctly
'
);
equal
(
RenderJSEmbeddedGadget
.
prototype
.
constructor
,
RenderJSEmbeddedGadget
,
'
constructor property of prototype is set correctly
'
);
});
test
(
'
should not accept parameter
'
,
function
()
{
equal
(
RenderJSEmbeddedGadget
.
length
,
0
);
});
test
(
'
should work without new
'
,
function
()
{
var
gadgetKlass
=
RenderJSEmbeddedGadget
,
gadget
=
gadgetKlass
();
equal
(
gadget
.
constructor
,
RenderJSEmbeddedGadget
,
'
constructor property of instances is set correctly
'
);
ok
(
gadget
instanceof
RenderJSGadget
);
ok
(
gadget
instanceof
RenderJSEmbeddedGadget
);
ok
(
RenderJSEmbeddedGadget
!==
RenderJSGadget
);
});
/////////////////////////////////////////////////////////////////
// RenderJSGadget.declareGadget (public)
/////////////////////////////////////////////////////////////////
module
(
"
RenderJSGadget.declareGadget
"
,
{
setup
:
function
()
{
...
...
@@ -1358,6 +1440,7 @@
gadget
.
declareGadget
(
url
)
//, $('#qunit-fixture'))
.
then
(
function
(
new_gadget
)
{
equal
(
new_gadget
.
path
,
url
);
ok
(
new_gadget
instanceof
RenderJSGadget
);
})
.
always
(
function
()
{
start
();
...
...
@@ -1424,7 +1507,7 @@
$
(
'
#qunit-fixture
'
).
html
(
"
<div></div><div>bar</div>
"
);
stop
();
gadget
.
declareGadget
(
html_url
)
//, $('#qunit-fixture').find("div").last()[0])
gadget
.
declareGadget
(
html_url
)
.
then
(
function
(
new_gadget
)
{
equal
(
$
(
'
#qunit-fixture
'
).
html
(),
"
<div>youhou2</div><div>bar</div>
"
);
...
...
@@ -1545,7 +1628,7 @@
stop
();
$
(
'
#qunit-fixture
'
).
html
(
"
<div></div><div></div>
"
);
gadget
.
declareGadget
(
html_url
)
//, $('#qunit-fixture').find("div").last()[0])
gadget
.
declareGadget
(
html_url
)
.
always
(
function
()
{
equal
(
$
(
'
#qunit-fixture
'
).
html
(),
"
<div>youhou</div><div></div>
"
);
...
...
@@ -1661,7 +1744,10 @@
stop
();
renderJS
.
declareGadgetKlass
(
html_url
)
.
then
(
function
(
Klass
)
{
return
gadget
.
declareGadget
(
html_url
,
{
element
:
$
(
'
#qunit-fixture
'
)[
0
]});
return
gadget
.
declareGadget
(
html_url
,
{
element
:
$
(
'
#qunit-fixture
'
)[
0
]}
);
})
.
then
(
function
()
{
equal
(
$
(
'
#qunit-fixture
'
).
html
(),
'
<p>foo</p>
'
);
...
...
@@ -1676,6 +1762,159 @@
});
});
/////////////////////////////////////////////////////////////////
// RenderJSGadget.declareGadget (iframe)
/////////////////////////////////////////////////////////////////
test
(
'
Require the element options
'
,
function
()
{
// Subclass RenderJSGadget to not pollute its namespace
var
gadget
=
new
RenderJSGadget
(),
server
=
sinon
.
fakeServer
.
create
(),
html_url
=
'
https://example.org/files/qunittest/test98.html
'
;
server
.
autoRespond
=
true
;
server
.
autoRespondAfter
=
5
;
server
.
respondWith
(
"
GET
"
,
html_url
,
[
200
,
{
"
Content-Type
"
:
"
text/html
"
,
},
"
<html><body><p>foo</p></body></html>
"
]);
stop
();
renderJS
.
declareGadgetKlass
(
html_url
)
.
then
(
function
(
Klass
)
{
return
gadget
.
declareGadget
(
html_url
,
{
sandbox
:
'
iframe
'
});
})
.
then
(
function
()
{
ok
(
false
);
})
.
fail
(
function
(
e
)
{
ok
(
e
instanceof
Error
);
equal
(
e
.
message
,
"
DOM element is required to create Iframe Gadget
"
+
html_url
);
})
.
always
(
function
()
{
start
();
server
.
restore
();
});
});
test
(
'
Require a DOM element as option
'
,
function
()
{
// Subclass RenderJSGadget to not pollute its namespace
var
gadget
=
new
RenderJSGadget
(),
server
=
sinon
.
fakeServer
.
create
(),
html_url
=
'
https://example.org/files/qunittest/test98.html
'
;
server
.
autoRespond
=
true
;
server
.
autoRespondAfter
=
5
;
server
.
respondWith
(
"
GET
"
,
html_url
,
[
200
,
{
"
Content-Type
"
:
"
text/html
"
,
},
"
<html><body><p>foo</p></body></html>
"
]);
stop
();
renderJS
.
declareGadgetKlass
(
html_url
)
.
then
(
function
(
Klass
)
{
return
gadget
.
declareGadget
(
html_url
,
{
sandbox
:
'
iframe
'
,
element
:
document
.
createElement
(
"
div
"
)
});
})
.
then
(
function
()
{
ok
(
false
);
})
.
fail
(
function
(
e
)
{
ok
(
e
instanceof
Error
);
equal
(
e
.
message
,
"
The parent element is not attached to the DOM for
"
+
html_url
);
})
.
always
(
function
()
{
start
();
server
.
restore
();
});
});
test
(
'
provide an iframed gadget as callback parameter
'
,
function
()
{
// Check that declare gadget returns the gadget
var
gadget
=
new
RenderJSGadget
(),
url
=
"
./embedded.html
"
;
$
(
'
#qunit-fixture
'
).
text
(
''
);
stop
();
gadget
.
declareGadget
(
url
,
{
sandbox
:
'
iframe
'
,
element
:
$
(
'
#qunit-fixture
'
)[
0
]
})
.
then
(
function
(
new_gadget
)
{
equal
(
new_gadget
.
path
,
url
);
ok
(
new_gadget
instanceof
RenderJSIframeGadget
);
equal
(
$
(
new_gadget
.
element
).
html
(),
'
<iframe src="
'
+
url
+
'
"></iframe>
'
);
ok
(
new_gadget
.
chan
!==
undefined
);
})
.
always
(
function
()
{
start
();
});
});
test
(
'
checking working iframe gadget
'
,
function
()
{
// Check that declare gadget returns the gadget
var
gadget
=
new
RenderJSGadget
(),
url
=
"
./embedded.html
"
;
$
(
'
#qunit-fixture
'
).
text
(
''
);
stop
();
gadget
.
declareGadget
(
url
,
{
sandbox
:
'
iframe
'
,
element
:
$
(
'
#qunit-fixture
'
)[
0
]
})
.
then
(
function
(
new_gadget
)
{
return
new
RSVP
.
Queue
()
// Check that ready function are called
.
push
(
function
()
{
return
new_gadget
.
wasReadyCalled
();
})
.
push
(
function
(
result
)
{
equal
(
result
,
true
);
})
// Custom method accept parameter
// and return value
.
push
(
function
()
{
return
new_gadget
.
setContent
(
"
foobar
"
);
})
.
push
(
function
(
result
)
{
return
new_gadget
.
getContent
();
})
.
push
(
function
(
result
)
{
equal
(
result
,
"
foobar
"
);
})
// Method are propagated
.
push
(
function
()
{
return
new_gadget
.
triggerError
();
})
.
push
(
function
()
{
ok
(
false
,
"
triggerError should fail
"
);
},
function
(
e
)
{
equal
(
e
,
"
Error: Manually triggered embedded error
"
);
});
})
.
fail
(
function
()
{
ok
(
false
);
})
.
always
(
function
()
{
start
();
});
});
/////////////////////////////////////////////////////////////////
// RenderJSGadget bootstrap
/////////////////////////////////////////////////////////////////
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment