Skip to content

O
OpenBoard
Commit 7f82e82b authored by Anatoly Mihalchenko's avatar Anatoly Mihalchenko
Browse files
Options

Merge branch 'master' of github.com:Sankore/Sankore-3.1

parents 43efc824 ed812819
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 46 deletions
resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js
View file @ 7f82e82b
...@@ -47,8 +47,6 @@ if(window.sankore){ ...@@ -47,8 +47,6 @@ if(window.sankore){
word = sankoreLang.example; word = sankoreLang.example;
} }
var doCheckWord = true;
// array of dom elements // array of dom elements
var letters = []; var letters = [];
...@@ -67,11 +65,14 @@ var widget_padding = 0; ...@@ -67,11 +65,14 @@ var widget_padding = 0;
var min_view_width = 400; var min_view_width = 400;
$(document).ready(function(){ $(document).ready(function(){
if(window.sankore){
if(sankore.preference("ord_words_style","")){ if(sankore.preference("ord_words_style","")){
changeStyle(sankore.preference("ord_words_style","")); changeStyle(sankore.preference("ord_words_style",""));
$(".style_select").val(sankore.preference("ord_words_style","")); $(".style_select").val(sankore.preference("ord_words_style",""));
} else } else
changeStyle("3") changeStyle("3")
} else
changeStyle("3")
$("#wgt_display").text(sankoreLang.view); $("#wgt_display").text(sankoreLang.view);
$("#wgt_edit").text(sankoreLang.edit); $("#wgt_edit").text(sankoreLang.edit);
$("#wgt_display, #wgt_edit").click(function(event){ $("#wgt_display, #wgt_edit").click(function(event){
...@@ -300,7 +301,7 @@ turns the widget into the view mode ...@@ -300,7 +301,7 @@ turns the widget into the view mode
function modeView() function modeView()
{ {
if( editMode ){ if( editMode ){
word = $( "#mp_word input:text" ).attr( "value" ); word = $( "#mp_word .wgt_cont" ).val();
} }
wgtState = false; wgtState = false;
...@@ -360,14 +361,15 @@ function modeEdit() ...@@ -360,14 +361,15 @@ function modeEdit()
{ {
editMode = true; editMode = true;
wgtState = true; wgtState = true;
$( "#mp_word").css( "margin-left", 0 ).empty().append('<input value="'+word+'">'); $( "#mp_word").sortable( "destroy" );
$( "#mp_word").css( "margin-left", 0 ).empty().append('<textarea class="wgt_cont">'+word+'</textarea>');
} }
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val()); sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val());
if($( "#mp_word input:text" ).attr( "value" )) if($( "#mp_word .wgt_cont" ).val())
{ {
modeView(); modeView();
var str = ""; var str = "";
......
resources/library/interactivities/Ordre mots.wgt/locales/ru/scripts/template2.js
View file @ 7f82e82b
...@@ -47,8 +47,6 @@ if(window.sankore){ ...@@ -47,8 +47,6 @@ if(window.sankore){
word = sankoreLang.example; word = sankoreLang.example;
} }
var doCheckWord = true;
// array of dom elements // array of dom elements
var letters = []; var letters = [];
...@@ -67,11 +65,14 @@ var widget_padding = 0; ...@@ -67,11 +65,14 @@ var widget_padding = 0;
var min_view_width = 400; var min_view_width = 400;
$(document).ready(function(){ $(document).ready(function(){
if(window.sankore){
if(sankore.preference("ord_words_style","")){ if(sankore.preference("ord_words_style","")){
changeStyle(sankore.preference("ord_words_style","")); changeStyle(sankore.preference("ord_words_style",""));
$(".style_select").val(sankore.preference("ord_words_style","")); $(".style_select").val(sankore.preference("ord_words_style",""));
} else } else
changeStyle("3") changeStyle("3")
} else
changeStyle("3")
$("#wgt_display").text(sankoreLang.view); $("#wgt_display").text(sankoreLang.view);
$("#wgt_edit").text(sankoreLang.edit); $("#wgt_edit").text(sankoreLang.edit);
$("#wgt_display, #wgt_edit").click(function(event){ $("#wgt_display, #wgt_edit").click(function(event){
...@@ -300,7 +301,7 @@ turns the widget into the view mode ...@@ -300,7 +301,7 @@ turns the widget into the view mode
function modeView() function modeView()
{ {
if( editMode ){ if( editMode ){
word = $( "#mp_word input:text" ).attr( "value" ); word = $( "#mp_word .wgt_cont" ).val();
} }
wgtState = false; wgtState = false;
...@@ -360,14 +361,15 @@ function modeEdit() ...@@ -360,14 +361,15 @@ function modeEdit()
{ {
editMode = true; editMode = true;
wgtState = true; wgtState = true;
$( "#mp_word").css( "margin-left", 0 ).empty().append('<input value="'+word+'">'); $( "#mp_word").sortable( "destroy" );
$( "#mp_word").css( "margin-left", 0 ).empty().append('<textarea class="wgt_cont">'+word+'</textarea>');
} }
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val()); sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val());
if($( "#mp_word input:text" ).attr( "value" )) if($( "#mp_word .wgt_cont" ).val())
{ {
modeView(); modeView();
var str = ""; var str = "";
......
resources/library/interactivities/Ordre mots.wgt/scripts/template2.js
View file @ 7f82e82b
...@@ -65,12 +65,14 @@ var widget_padding = 0; ...@@ -65,12 +65,14 @@ var widget_padding = 0;
var min_view_width = 400; var min_view_width = 400;
$(document).ready(function(){ $(document).ready(function(){
if(window.sankore) if(window.sankore){
if(sankore.preference("ord_words_style","")){ if(sankore.preference("ord_words_style","")){
changeStyle(sankore.preference("ord_words_style","")); changeStyle(sankore.preference("ord_words_style",""));
$(".style_select").val(sankore.preference("ord_words_style","")); $(".style_select").val(sankore.preference("ord_words_style",""));
} else } else
changeStyle("3") changeStyle("3")
} else
changeStyle("3")
$("#wgt_display").text(sankoreLang.view); $("#wgt_display").text(sankoreLang.view);
$("#wgt_edit").text(sankoreLang.edit); $("#wgt_edit").text(sankoreLang.edit);
$("#wgt_display, #wgt_edit").click(function(event){ $("#wgt_display, #wgt_edit").click(function(event){
...@@ -299,7 +301,7 @@ turns the widget into the view mode ...@@ -299,7 +301,7 @@ turns the widget into the view mode
function modeView() function modeView()
{ {
if( editMode ){ if( editMode ){
word = $( "#mp_word input:text" ).attr( "value" ); word = $( "#mp_word .wgt_cont" ).val();
} }
wgtState = false; wgtState = false;
...@@ -359,14 +361,15 @@ function modeEdit() ...@@ -359,14 +361,15 @@ function modeEdit()
{ {
editMode = true; editMode = true;
wgtState = true; wgtState = true;
$( "#mp_word").css( "margin-left", 0 ).empty().append('<input value="'+word+'">'); $( "#mp_word").sortable( "destroy" );
$( "#mp_word").css( "margin-left", 0 ).empty().append('<textarea class="wgt_cont">'+word+'</textarea>');
} }
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val()); sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val());
if($( "#mp_word input:text" ).attr( "value" )) if($( "#mp_word .wgt_cont" ).val())
{ {
modeView(); modeView();
var str = ""; var str = "";
......
resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css
View file @ 7f82e82b
...@@ -12,7 +12,7 @@ body{ ...@@ -12,7 +12,7 @@ body{
.letter{ .letter{
min-width: 30px; min-width: 30px;
max-width: 500px; max-width: 600px;
height: 40px; height: 40px;
overflow: hidden; overflow: hidden;
border: solid 1px #ccc; border: solid 1px #ccc;
...@@ -43,11 +43,12 @@ body{ ...@@ -43,11 +43,12 @@ body{
text-align: center; text-align: center;
} }
#mp_word input{ #mp_word .wgt_cont{
font: 32px tahoma; font: 32px tahoma;
letter-spacing: 0.1em; letter-spacing: 0.1em;
width: 98%; width: 98%;
overflow: auto; min-height: 200px;
resize: vertical;
} }
#mp_msg{ #mp_msg{
......
resources/library/search/Audio Planete.wgs/index.html
View file @ 7f82e82b
...@@ -107,7 +107,6 @@ ...@@ -107,7 +107,6 @@
function imageDragging(e){ function imageDragging(e){
e.dataTransfer.setData("text/plain",$(this).find("input:hidden").eq(0).val()); e.dataTransfer.setData("text/plain",$(this).find("input:hidden").eq(0).val());
// alert($(this).find("input:hidden").eq(0).val());
} }
function imageDragleave(e){ function imageDragleave(e){
...@@ -235,15 +234,12 @@ ...@@ -235,15 +234,12 @@
function createMetaData(parent){ function createMetaData(parent){
var meta = ""; var meta = "";
//alert($(this).find("input:hidden").eq(0).val()); //alert($(this).find("input:hidden").eq(0).val());
meta = "<metadata><data><key>Type</key><value>Image</value></data><data><key>Url</key><value>" + meta = "<metadata><data><key>Type</key><value>Audio</value></data><data><key>Url</key><value>" +
parent.find("input:hidden").eq(0).val() + parent.find("input:hidden").eq(0).val() +
"</value></data><data><key>Content</key><value>" + "</value></data><data><key>Content</key><value>" +
parent.find("input:hidden").eq(1).val() + parent.find("input:hidden").eq(1).val() +
"</value></data><data><key>Height</key><value>" + "</value></data><data><key>Height</key><value>n/a</value></data>"+
parent.find("input:hidden").eq(2).val() + "<data><key>Width</key><value>n/a</value></data><data><key>Title</key><value>" +
"</value></data><data><key>Width</key><value>" +
parent.find("input:hidden").eq(3).val() +
"</value></data><data><key>Title</key><value>" +
parent.find("input:hidden").eq(4).val() + parent.find("input:hidden").eq(4).val() +
"</value></data></metadata>"; "</value></data></metadata>";
return meta; return meta;
......
resources/library/search/Flash Planete.wgs/index.html
View file @ 7f82e82b
...@@ -234,16 +234,12 @@ ...@@ -234,16 +234,12 @@
function createMetaData(parent){ function createMetaData(parent){
var meta = ""; var meta = "";
//alert($(this).find("input:hidden").eq(0).val()); meta = "<metadata><data><key>Type</key><value>Flash</value></data><data><key>Url</key><value>" +
meta = "<metadata><data><key>Type</key><value>Image</value></data><data><key>Url</key><value>" +
parent.find("input:hidden").eq(0).val() + parent.find("input:hidden").eq(0).val() +
"</value></data><data><key>Content</key><value>" + "</value></data><data><key>Content</key><value>" +
parent.find("input:hidden").eq(1).val() + parent.find("input:hidden").eq(1).val() +
"</value></data><data><key>Height</key><value>" + "</value></data><data><key>Height</key><value>n/a</value></data>"+
parent.find("input:hidden").eq(2).val() + "<data><key>Width</key><value>n/a</value></data><data><key>Title</key><value>" +
"</value></data><data><key>Width</key><value>" +
parent.find("input:hidden").eq(3).val() +
"</value></data><data><key>Title</key><value>" +
parent.find("input:hidden").eq(4).val() + parent.find("input:hidden").eq(4).val() +
"</value></data></metadata>"; "</value></data></metadata>";
return meta; return meta;
......
resources/library/search/Video Planete.wgs/index.html
View file @ 7f82e82b
...@@ -235,15 +235,12 @@ ...@@ -235,15 +235,12 @@
function createMetaData(parent){ function createMetaData(parent){
var meta = ""; var meta = "";
//alert($(this).find("input:hidden").eq(0).val()); //alert($(this).find("input:hidden").eq(0).val());
meta = "<metadata><data><key>Type</key><value>Image</value></data><data><key>Url</key><value>" + meta = "<metadata><data><key>Type</key><value>Video</value></data><data><key>Url</key><value>" +
parent.find("input:hidden").eq(0).val() + parent.find("input:hidden").eq(0).val() +
"</value></data><data><key>Content</key><value>" + "</value></data><data><key>Content</key><value>" +
parent.find("input:hidden").eq(1).val() + parent.find("input:hidden").eq(1).val() +
"</value></data><data><key>Height</key><value>" + "</value></data><data><key>Height</key><value>n/a</value></data>"+
parent.find("input:hidden").eq(2).val() + "<data><key>Width</key><value>n/a</value></data><data><key>Title</key><value>" +
"</value></data><data><key>Width</key><value>" +
parent.find("input:hidden").eq(3).val() +
"</value></data><data><key>Title</key><value>" +
parent.find("input:hidden").eq(4).val() + parent.find("input:hidden").eq(4).val() +
"</value></data></metadata>"; "</value></data></metadata>";
return meta; return meta;
......
src/board/UBBoardView.cpp
View file @ 7f82e82b
...@@ -1040,6 +1040,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) ...@@ -1040,6 +1040,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
mMouseButtonIsPressed = false; mMouseButtonIsPressed = false;
mPendingStylusReleaseEvent = false; mPendingStylusReleaseEvent = false;
mTabletStylusIsPressed = false; mTabletStylusIsPressed = false;
movingItem = NULL;
mLongPressTimer.stop(); mLongPressTimer.stop();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment