TIMOB-9539: BlackBerry: Implement include() #91
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reviewers: DavidC, DavidL
ChangeLog:
- Added include functionality to Ti namespace.
Test Cases:
- Run tibbtest.
- Make sure include_test.js included in bar-descriptor.xml
- Make sure Ti.include(<filename>) works correctly.
- Use the following app.js snippet:
////////////////////////////////////////
:app.js
var win1 = Titanium.UI.createWindow({
backgroundColor:'#F00'
});
var label1 = Ti.UI.createLabel({
text:'Hello, world!',
color:'green',
top: 200
});
win1.add(label1);
Ti.include('include_test.js');
// open window
win1.open();
////////////////////////////////////////
:include_test.js
var mybutton=Ti.UI.createButton
(
{top: 100,title: 'Push Me'}
);
mybutton.addEventListener
(
'click',
function(e)
{
e.source.title='Pushed!';
slider1.backgroundColor='#00F';
progress1.backgroundColor='#0F0';
}
);
win1.add(mybutton);
| } | ||
|
|
||
| string fileName = "app/native/assets/"; | ||
| fileName += *String::Utf8Value(javaScript); |
There was a problem hiding this comment.
This does not fulfil the contract of being "interpreted local to the current file" as specified in the docs.
There was a problem hiding this comment.
We also need to make sure this gets run in the proper context.
|
Reviewed |
Reviewers: DavidC, DavidL
ChangeLog:
- Address comments.
- Making include filename interpreted local to the current file.
Test Cases:
•Run tibbtest.
•Make sure include_test.js included in bar-descriptor.xml
•Make sure Ti.include() works correctly.
•Use the following app.js snippet (including include_test.js and include_test1.js):
////////////////////////////////////////
:app.js
var win1 = Titanium.UI.createWindow({
backgroundColor:'#F00'
});
var label1 = Ti.UI.createLabel({
text:'Hello, world!',
color:'green',
top: 200
});
win1.add(label1);
Ti.include('include_test.js');
// open window
win1.open();
////////////////////////////////////////
:include_test.js
var mybutton=Ti.UI.createButton
(
{top: 100,title: 'Push Me'}
);
mybutton.addEventListener
(
'click',
function(e)
{
e.source.title='Pushed!';
slider1.backgroundColor='#00F';
progress1.backgroundColor='#0F0';
}
);
Ti.include('include_test1.js');
win1.add(mybutton);
////////////////////////////////////////
:include_test1.js
var slider1=Ti.UI.createSlider
(
{
top: 200,
min: 0,
max: 100,
value: 50,
}
);
var sliderListener=function(e)
{
progress1.value=100-e.value;
label1.text='Slider value: '+e.value;
label1.top=e.value;
mybutton.opacity=e.value/100.0;
};
slider1.addEventListener('change',sliderListener);
win1.add(slider1);
|
Updated. |
| { | ||
| String::Utf8Value error(tryCatch.Exception()); | ||
| TiLogger::getInstance().log(string(*error) + "\n"); | ||
| return ThrowException(tryCatch.Exception()); |
There was a problem hiding this comment.
This seems like duplicated effort. Won't ThrowException display the error in the log?
There was a problem hiding this comment.
You should add the name of the file that can't be found to the exception.
|
Reviewed |
|
|
||
| ifstream ifs(fullPath.c_str()); | ||
|
|
||
| if (ifs.bad()) |
There was a problem hiding this comment.
I just realized this won't be true if the file does not exist. Use fail() instead, which also checks the badbit.
|
Reviewed |
Reviewers: DavidC, DavidL
ChangeLog:
- Address comments.
Test Cases:
- Run tibbtest.
- Make sure include_test.js included in bar-descriptor.xml
- Make sure Ti.include() works correctly.
- Use the following app.js snippet:
////////////////////////////////////////
:app.js
var win1 = Titanium.UI.createWindow({
backgroundColor:'#F00'
});
var label1 = Ti.UI.createLabel({
text:'Hello, world!',
color:'green',
top: 200
});
win1.add(label1);
Ti.include('include_test.js');
// open window
win1.open();
////////////////////////////////////////
:include_test.js
var mybutton=Ti.UI.createButton
(
{top: 100,title: 'Push Me'}
);
mybutton.addEventListener
(
'click',
function(e)
{
e.source.title='Pushed!';
slider1.backgroundColor='#00F';
progress1.backgroundColor='#0F0';
}
);
win1.add(mybutton);
|
Updated. |
|
Approved |
1 similar comment
|
Approved |
…erry' into includeBranch Conflicts: blackberry/tibb/TiMessageStrings.h
alexandergalstyan
added a commit
that referenced
this pull request
Jul 9, 2012
TIMOB-9539: BlackBerry: Implement include()
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reviewers: DavidC, DavidL
ChangeLog:
Test Cases:
////////////////////////////////////////
:app.js
var win1 = Titanium.UI.createWindow({
backgroundColor:'#F00'
});
var label1 = Ti.UI.createLabel({
text:'Hello, world!',
color:'green',
top: 200
});
win1.add(label1);
Ti.include('include_test.js');
// open window
win1.open();
////////////////////////////////////////
:include_test.js
var mybutton=Ti.UI.createButton
(
{top: 100,title: 'Push Me'}
);
mybutton.addEventListener
(
'click',
function(e)
{
e.source.title='Pushed!';
slider1.backgroundColor='#00F';
progress1.backgroundColor='#0F0';
}
);
win1.add(mybutton);